From 9d1090b19421521a1b000d40d02aae18d1eb7f61 Mon Sep 17 00:00:00 2001 From: Tobias Jakobi Date: Mon, 27 Jan 2014 23:03:08 +0100 Subject: [PATCH 1/3] video_lima: remove unused and redundant variables --- gfx/lima_gfx.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gfx/lima_gfx.c b/gfx/lima_gfx.c index 3cd9fab518..04c4790ecb 100644 --- a/gfx/lima_gfx.c +++ b/gfx/lima_gfx.c @@ -421,7 +421,6 @@ static void put_glyph_rgba4444(limare_data_t *pdata, const uint8_t *src, uint8_t unsigned dst_x, unsigned dst_y) { unsigned x, y; uint16_t *dst; - unsigned r, g, b; dst = (uint16_t*)pdata->buffer + dst_y * pdata->font_width + dst_x; @@ -441,14 +440,11 @@ typedef struct lima_video { const font_renderer_driver_t *font_driver; uint8_t font_rgb[4]; - unsigned bytes_per_pixel; - /* current dimensions */ unsigned width; unsigned height; /* RGUI data */ - void *rgui_buffer; int rgui_rotation; float rgui_alpha; bool rgui_active; @@ -469,7 +465,6 @@ static void lima_gfx_free(void *data) { destroy_textures(vid->lima); free(vid->lima->textures); - free(vid->rgui_buffer); free(vid->lima); free(vid); } @@ -575,8 +570,6 @@ static void *lima_gfx_init(const video_info_t *video, const input_driver_t **inp lima = calloc(1, sizeof(limare_data_t)); if (!lima) return NULL; - vid->bytes_per_pixel = video->rgb32 ? 4 : 2; - /* Request the Exynos DRM backend for rendering. */ limare_config.type = LIMARE_WINDOWSYS_DRM; limare_config.connector_index = g_settings.video.monitor_index; @@ -601,9 +594,9 @@ static void *lima_gfx_init(const video_info_t *video, const input_driver_t **inp lima->font_height = 480; lima->font_width = align4((unsigned)(lima->screen_aspect * (float)lima->font_height)); - lima->upload_format = (vid->bytes_per_pixel == 4) ? + lima->upload_format = video->rgb32 ? LIMA_TEXEL_FORMAT_RGBA_8888 : LIMA_TEXEL_FORMAT_BGR_565; - lima->upload_bpp = vid->bytes_per_pixel; + lima->upload_bpp = video->rgb32 ? 4 : 2; limare_enable(lima->state, GL_DEPTH_TEST); limare_depth_func(lima->state, GL_ALWAYS); From 6ab202f25faf6287b9e75202cee1abea37afd4b4 Mon Sep 17 00:00:00 2001 From: Tobias Jakobi Date: Mon, 27 Jan 2014 23:05:45 +0100 Subject: [PATCH 2/3] video_lima: whitespace fixes --- gfx/lima_gfx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gfx/lima_gfx.c b/gfx/lima_gfx.c index 04c4790ecb..6979c874ec 100644 --- a/gfx/lima_gfx.c +++ b/gfx/lima_gfx.c @@ -338,14 +338,14 @@ static int setup_data(limare_data_t *pdata) { }; static const vec2f_t coords[16] = { - {0.0f, 1.0f}, {1.0f, 1.0f}, /* 0 degrees */ - {0.0f, 0.0f}, {1.0f, 0.0f}, - {0.0f, 0.0f}, {0.0f, 1.0f}, /* 90 degrees */ - {1.0f, 0.0f}, {1.0f, 1.0f}, - {1.0f, 0.0f}, {0.0f, 0.0f}, /* 180 degrees */ - {1.0f, 1.0f}, {0.0f, 1.0f}, - {1.0f, 1.0f}, {1.0f, 0.0f}, /* 270 degrees */ - {0.0f, 1.0f}, {0.0f, 0.0f} + {0.0f, 1.0f}, {1.0f, 1.0f}, /* 0 degrees */ + {0.0f, 0.0f}, {1.0f, 0.0f}, + {0.0f, 0.0f}, {0.0f, 1.0f}, /* 90 degrees */ + {1.0f, 0.0f}, {1.0f, 1.0f}, + {1.0f, 0.0f}, {0.0f, 0.0f}, /* 180 degrees */ + {1.0f, 1.0f}, {0.0f, 1.0f}, + {1.0f, 1.0f}, {1.0f, 0.0f}, /* 270 degrees */ + {0.0f, 1.0f}, {0.0f, 0.0f} }; pdata->vertices = calloc(num_verts, sizeof(vec3f_t)); From 18e37b2d478bdb9203e2ee627fbc82a0a80eb94f Mon Sep 17 00:00:00 2001 From: Tobias Jakobi Date: Tue, 28 Jan 2014 03:02:04 +0100 Subject: [PATCH 3/3] video_lima: set wrap mode to clamp for all textures we use --- gfx/lima_gfx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gfx/lima_gfx.c b/gfx/lima_gfx.c index 6979c874ec..4983c81bc4 100644 --- a/gfx/lima_gfx.c +++ b/gfx/lima_gfx.c @@ -255,6 +255,12 @@ static limare_texture_t *add_texture(limare_data_t *pdata, if (texture == -1) return NULL; + /* Set magnification to linear and minification to nearest, since we will * + * probably only ever scale the image to larger dimensions. Also set * + * wrap mode for both coords to clamp, which should eliminate some artifacts. */ + limare_texture_parameters(pdata->state, texture, GL_LINEAR, GL_NEAREST, + GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE); + pdata->textures[i] = calloc(1, sizeof(limare_texture_t)); pdata->textures[i]->width = width;