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

(GL) Prevent memcpy on gl->tex_coords

Browse Source
This commit is contained in:
twinaphex 2014-10-01 20:37:52 +02:00
parent 7812e06479
commit 43c9948087
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/fonts/gl_raster_font.c
View File

@ -189,7 +189,7 @@ static void render_message(gl_raster_t *font, const char *msg, GLfloat scale,
/* Post - Go back to old rendering path. */ /* Post - Go back to old rendering path. */
gl->coords.vertex = gl->vertex_ptr; gl->coords.vertex = gl->vertex_ptr;
gl->coords.tex_coord = gl->tex_coords; gl->coords.tex_coord = gl->tex_info.coord;
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
gl->coords.vertices = 4; gl->coords.vertices = 4;
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]); glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);

31
gfx/gl.c
View File

@ -1060,7 +1060,7 @@ static void gl_frame_fbo(gl_t *gl, const struct gl_tex_info *tex_info)
gl_shader_set_coords(gl, &gl->coords, &gl->mvp); gl_shader_set_coords(gl, &gl->coords, &gl->mvp);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
gl->coords.tex_coord = gl->tex_coords; gl->coords.tex_coord = gl->tex_info.coord;
} }
#endif #endif
@ -1106,7 +1106,7 @@ static void gl_update_input_size(gl_t *gl, unsigned width, unsigned height, unsi
{ {
GLfloat xamt = (GLfloat)width / gl->tex_w; GLfloat xamt = (GLfloat)width / gl->tex_w;
GLfloat yamt = (GLfloat)height / gl->tex_h; GLfloat yamt = (GLfloat)height / gl->tex_h;
set_texture_coords(gl->tex_coords, xamt, yamt); set_texture_coords(gl->tex_info.coord, xamt, yamt);
} }
} }
@ -1436,7 +1436,7 @@ static inline void gl_draw_texture(gl_t *gl)
glDisable(GL_BLEND); glDisable(GL_BLEND);
gl->coords.vertex = gl->vertex_ptr; gl->coords.vertex = gl->vertex_ptr;
gl->coords.tex_coord = gl->tex_coords; gl->coords.tex_coord = gl->tex_info.coord;
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
} }
#endif #endif
@ -1543,14 +1543,11 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
} }
#endif #endif
struct gl_tex_info tex_info = {0}; gl->tex_info.tex = gl->texture[gl->tex_index];
tex_info.tex = gl->texture[gl->tex_index]; gl->tex_info.input_size[0] = width;
tex_info.input_size[0] = width; gl->tex_info.input_size[1] = height;
tex_info.input_size[1] = height; gl->tex_info.tex_size[0] = gl->tex_w;
tex_info.tex_size[0] = gl->tex_w; gl->tex_info.tex_size[1] = gl->tex_h;
tex_info.tex_size[1] = gl->tex_h;
memcpy(tex_info.coord, gl->tex_coords, sizeof(gl->tex_coords));
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
@ -1559,7 +1556,7 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
gl->tex_w, gl->tex_h, gl->tex_w, gl->tex_h,
gl->vp.width, gl->vp.height, gl->vp.width, gl->vp.height,
g_extern.frame_count, g_extern.frame_count,
&tex_info, gl->prev_info, NULL, 0); &gl->tex_info, gl->prev_info, NULL, 0);
gl->coords.vertices = 4; gl->coords.vertices = 4;
gl_shader_set_coords(gl, &gl->coords, &gl->mvp); gl_shader_set_coords(gl, &gl->coords, &gl->mvp);
@ -1567,10 +1564,10 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
#ifdef HAVE_FBO #ifdef HAVE_FBO
if (gl->fbo_inited) if (gl->fbo_inited)
gl_frame_fbo(gl, &tex_info); gl_frame_fbo(gl, &gl->tex_info);
#endif #endif
gl_set_prev_texture(gl, &tex_info); gl_set_prev_texture(gl, &gl->tex_info);
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
if (g_extern.is_menu if (g_extern.is_menu
@ -2306,9 +2303,9 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glDisable(GL_DITHER); glDisable(GL_DITHER);
memcpy(gl->tex_coords, tex_coords, sizeof(tex_coords)); memcpy(gl->tex_info.coord, tex_coords, sizeof(gl->tex_info.coord));
gl->coords.vertex = gl->vertex_ptr; gl->coords.vertex = gl->vertex_ptr;
gl->coords.tex_coord = gl->tex_coords; gl->coords.tex_coord = gl->tex_info.coord;
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
gl->coords.lut_tex_coord = tex_coords; gl->coords.lut_tex_coord = tex_coords;
gl->coords.vertices = 4; gl->coords.vertices = 4;
@ -2817,7 +2814,7 @@ static void gl_render_overlay(void *data)
glDisable(GL_BLEND); glDisable(GL_BLEND);
gl->coords.vertex = gl->vertex_ptr; gl->coords.vertex = gl->vertex_ptr;
gl->coords.tex_coord = gl->tex_coords; gl->coords.tex_coord = gl->tex_info.coord;
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
gl->coords.vertices = 4; gl->coords.vertices = 4;
if (gl->overlay_full_screen) if (gl->overlay_full_screen)

2
gfx/gl_common.h
View File

@ -206,6 +206,7 @@ typedef struct gl
GLuint texture[MAX_TEXTURES]; GLuint texture[MAX_TEXTURES];
unsigned tex_index; /* For use with PREV. */ unsigned tex_index; /* For use with PREV. */
unsigned textures; unsigned textures;
struct gl_tex_info tex_info;
struct gl_tex_info prev_info[MAX_TEXTURES]; struct gl_tex_info prev_info[MAX_TEXTURES];
GLuint tex_mag_filter; GLuint tex_mag_filter;
GLuint tex_min_filter; GLuint tex_min_filter;
@ -254,7 +255,6 @@ typedef struct gl
unsigned last_width[MAX_TEXTURES]; unsigned last_width[MAX_TEXTURES];
unsigned last_height[MAX_TEXTURES]; unsigned last_height[MAX_TEXTURES];
unsigned tex_w, tex_h; unsigned tex_w, tex_h;
GLfloat tex_coords[8];
math_matrix mvp, mvp_no_rot; math_matrix mvp, mvp_no_rot;
struct gl_coords coords; struct gl_coords coords;