mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-17 19:21:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11826 from valadaa48/oga_gfx_ogs_support

Browse Source 
oga_gfx: support for OGS
This commit is contained in:
Autechre 2021-01-05 10:32:13 +01:00 committed by GitHub
commit fe848cae54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
gfx/drivers/oga_gfx.c
View File

@ -46,10 +46,6 @@
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)
#define NATIVE_WIDTH 480
#define NATIVE_HEIGHT 320
#define NATIVE_ASPECT_RATIO 1.5
#define ALIGN(val, align) (((val) + (align) - 1) & ~((align) - 1))
#define NUM_PAGES 3
@ -86,6 +82,9 @@ typedef struct oga_video
int fd;
uint32_t connector_id;
drmModeModeInfo mode;
int drm_width;
int drm_height;
float display_ar;
uint32_t crtc_id;
oga_surface_t* frame_surface;
@ -105,7 +104,7 @@ typedef struct oga_video
char last_msg[128];
} oga_video_t;
bool oga_create_display(oga_video_t* vid)
static bool oga_create_display(oga_video_t* vid)
{
int i, ret;
drmModeConnector *connector;
@ -203,7 +202,7 @@ err_01:
return false;
}
oga_surface_t* oga_create_surface(int display_fd,
static oga_surface_t* oga_create_surface(int display_fd,
int width, int height, int rk_format)
{
struct drm_mode_create_dumb args = {0};
@ -253,7 +252,7 @@ out:
return NULL;
}
void oga_destroy_surface(oga_surface_t* surface)
static void oga_destroy_surface(oga_surface_t* surface)
{
int io;
struct drm_mode_destroy_dumb args = { 0 };
@ -268,7 +267,7 @@ void oga_destroy_surface(oga_surface_t* surface)
free(surface);
}
oga_framebuf_t* oga_create_framebuf(oga_surface_t* surface)
static oga_framebuf_t* oga_create_framebuf(oga_surface_t* surface)
{
int ret;
const uint32_t handles[4] = {surface->handle, 0, 0, 0};
@ -305,7 +304,7 @@ oga_framebuf_t* oga_create_framebuf(oga_surface_t* surface)
return framebuf;
}
void oga_destroy_framebuf(oga_framebuf_t* framebuf)
static void oga_destroy_framebuf(oga_framebuf_t* framebuf)
{
if (drmModeRmFB(framebuf->surface->display_fd, framebuf->fb_id) != 0)
RARCH_ERR("drmModeRmFB failed.\n");
@ -380,6 +379,10 @@ static void *oga_gfx_init(const video_info_t *video,
return NULL;
}
vid->display_ar = (float)vid->mode.vdisplay / vid->mode.hdisplay;
vid->drm_width = vid->mode.vdisplay;
vid->drm_height = vid->mode.hdisplay;
RARCH_LOG("oga_gfx_init video %dx%d rgb32 %d smooth %d ctx_scaling %d"
" input_scale %u force_aspect %d fullscreen %d threaded %d base_width %d base_height %d"
" max_width %d max_height %d aw %d ah %d\n",
@ -387,7 +390,7 @@ static void *oga_gfx_init(const video_info_t *video,
video->input_scale, video->force_aspect, video->fullscreen, video->is_threaded, geom->base_width, geom->base_height,
geom->max_width, geom->max_height, aw, ah);
vid->menu_surface = oga_create_surface(vid->fd, NATIVE_WIDTH, NATIVE_HEIGHT, RK_FORMAT_BGRA_8888);
vid->menu_surface = oga_create_surface(vid->fd, vid->drm_width, vid->drm_height, RK_FORMAT_BGRA_8888);
vid->threaded = video->is_threaded;
/*
@ -402,7 +405,7 @@ static void *oga_gfx_init(const video_info_t *video,
vid->rotation = 0;
vid->frame_surface = oga_create_surface(vid->fd, geom->max_width, geom->max_height, video->rgb32 ? RK_FORMAT_BGRA_8888 : RK_FORMAT_RGB_565);
vid->msg_surface = oga_create_surface(vid->fd, NATIVE_WIDTH, NATIVE_HEIGHT, RK_FORMAT_BGRA_8888);
vid->msg_surface = oga_create_surface(vid->fd, vid->drm_width, vid->drm_height, RK_FORMAT_BGRA_8888);
vid->last_msg[0] = 0;
/* bitmap only for now */
@ -414,7 +417,7 @@ static void *oga_gfx_init(const video_info_t *video,
for (i = 0; i < NUM_PAGES; ++i)
{
oga_surface_t* surface = oga_create_surface(vid->fd, NATIVE_HEIGHT, NATIVE_WIDTH, RK_FORMAT_BGRA_8888);
oga_surface_t* surface = oga_create_surface(vid->fd, vid->drm_height, vid->drm_width, RK_FORMAT_BGRA_8888);
vid->pages[i] = oga_create_framebuf(surface);
if (!vid->pages[i])
return NULL;
@ -440,20 +443,6 @@ static void rga_clear_surface(oga_surface_t* surface, int color)
c_RkRgaColorFill(&dst);
}
int get_message_width(oga_video_t* vid, const char* msg)
{
int width = 0;
for (const char* c = msg; *c; c++)
{
const struct font_glyph* glyph = vid->font_driver->get_glyph(vid->font, *c);
if (unlikely(!glyph))
continue;
width += glyph->advance_x;
}
return width;
}
static bool render_msg(oga_video_t* vid, const char* msg)
{
const struct font_atlas* atlas;
@ -487,7 +476,7 @@ static bool render_msg(oga_video_t* vid, const char* msg)
if (vid->msg_height == 0)
vid->msg_height = g->height;
if (dest_x >= NATIVE_WIDTH)
if (dest_x >= vid->drm_width)
{
dest_x = 0;
dest_y += g->height;
@ -520,7 +509,7 @@ static bool render_msg(oga_video_t* vid, const char* msg)
return true;
}
void oga_blit(oga_surface_t* src, int sx, int sy, int sw, int sh,
static void oga_blit(oga_surface_t* src, int sx, int sy, int sw, int sh,
oga_surface_t* dst, int dx, int dy, int dw, int dh,
int rotation, int scale_mode, unsigned int blend)
{
@ -542,21 +531,21 @@ void oga_blit(oga_surface_t* src, int sx, int sy, int sw, int sh,
c_RkRgaBlit(&s, &d, NULL);
}
void oga_calc_bounds(oga_rect_t* r, int width, int height, float aspect)
static void oga_calc_bounds(oga_rect_t* r, int dw, int dh, int sw, int sh, float aspect, float dar)
{
if (NATIVE_ASPECT_RATIO >= aspect)
if (dar >= aspect)
{
r->h = NATIVE_HEIGHT;
r->w = MIN(NATIVE_WIDTH, (NATIVE_HEIGHT * aspect + 0.5));
r->x = (NATIVE_WIDTH - r->w) / 2 + 0.5;
r->h = dh;
r->w = MIN(dw, (dh * aspect + 0.5));
r->x = (int)((dw - r->w) / 2) + 0.5;
r->y = 0;
}
else
{
r->w = NATIVE_WIDTH;
r->h = MIN(NATIVE_HEIGHT, (NATIVE_WIDTH / aspect + 0.5));
r->w = dw;
r->h = MIN(dh, (dw / aspect + 0.5));
r->x = 0;
r->y = (NATIVE_HEIGHT - r->h) / 2 + 0.5;
r->y = (int)((dh - r->h) / 2) + 0.5;
}
}
@ -606,7 +595,7 @@ static bool oga_gfx_frame(void *data, const void *frame, unsigned width,
}
}
oga_calc_bounds(&r, width, height, aspect_ratio);
oga_calc_bounds(&r, vid->drm_width, vid->drm_height, width, height, aspect_ratio, vid->display_ar);
oga_blit(vid->frame_surface, 0, 0, width, height,
page_surface, r.y, r.x, r.h, r.w, vid->rotation, vid->scale_mode, blend);
}
@ -621,7 +610,7 @@ static bool oga_gfx_frame(void *data, const void *frame, unsigned width,
aspect_ratio = (float)width / height;
oga_rect_t r;
oga_calc_bounds(&r, width, height, aspect_ratio);
oga_calc_bounds(&r, vid->drm_width, vid->drm_height, width, height, aspect_ratio, vid->display_ar);
oga_blit(vid->menu_surface, 0, 0, width, height,
page_surface, r.y, r.x, r.h, r.w, HAL_TRANSFORM_ROT_270, vid->scale_mode, 0);
}
@ -709,8 +698,8 @@ static void oga_gfx_viewport_info(void *data, struct video_viewport *vp)
return;
vp->x = vp->y = 0;
vp->width = vp->full_width = NATIVE_WIDTH;
vp->height = vp->full_height = NATIVE_HEIGHT;
vp->width = vp->full_width = vid->mode.vdisplay;
vp->height = vp->full_height = vid->mode.hdisplay;
}
static bool oga_gfx_set_shader(void *data, enum rarch_shader_type type, const char *path)