mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GL) Prevent implicit memset; some other general cleanups

Browse Source
This commit is contained in:
twinaphex 2017-03-25 10:18:24 +01:00
parent d77c209c85
commit 7d79e367f9
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
View File

@ -238,29 +238,31 @@ void gl_check_fbo_dimensions(gl_t *gl)
} }
} }
} }
static GLfloat fbo_tex_coords[8] = {0.0f};
void gl_renderchain_render(gl_t *gl, void gl_renderchain_render(gl_t *gl,
video_frame_info_t *video_info, video_frame_info_t *video_info,
uint64_t frame_count, uint64_t frame_count,
const struct video_tex_info *tex_info, const struct video_tex_info *tex_info,
const struct video_tex_info *feedback_info) const struct video_tex_info *feedback_info)
{ {
int i;
GLfloat xamt, yamt;
unsigned mip_level; unsigned mip_level;
video_shader_ctx_mvp_t mvp; video_shader_ctx_mvp_t mvp;
video_shader_ctx_coords_t coords; video_shader_ctx_coords_t coords;
video_shader_ctx_params_t params; video_shader_ctx_params_t params;
video_shader_ctx_info_t shader_info; video_shader_ctx_info_t shader_info;
const struct video_fbo_rect *prev_rect;
struct video_tex_info *fbo_info; struct video_tex_info *fbo_info;
struct video_tex_info fbo_tex_info[GFX_MAX_SHADERS]; struct video_tex_info fbo_tex_info[GFX_MAX_SHADERS];
int i; const struct video_fbo_rect *prev_rect = NULL;
GLfloat xamt, yamt;
unsigned fbo_tex_info_cnt = 0; unsigned fbo_tex_info_cnt = 0;
GLfloat fbo_tex_coords[8] = {0.0f};
unsigned width = video_info->width; unsigned width = video_info->width;
unsigned height = video_info->height; unsigned height = video_info->height;
/* Render the rest of our passes. */ /* Render the rest of our passes. */
gl->coords.tex_coord = fbo_tex_coords; gl->coords.tex_coord = fbo_tex_coords;
/* Calculate viewports, texture coordinates etc, /* Calculate viewports, texture coordinates etc,
* and render all passes from FBOs, to another FBO. */ * and render all passes from FBOs, to another FBO. */
@ -426,16 +428,14 @@ void gl_renderchain_free(gl_t *gl)
static bool gl_create_fbo_targets(gl_t *gl) static bool gl_create_fbo_targets(gl_t *gl)
{ {
int i; int i;
GLenum status;
if (!gl)
return false;
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glGenFramebuffers(gl->fbo_pass, gl->fbo); glGenFramebuffers(gl->fbo_pass, gl->fbo);
for (i = 0; i < gl->fbo_pass; i++) for (i = 0; i < gl->fbo_pass; i++)
{ {
GLenum status;
glBindFramebuffer(RARCH_GL_FRAMEBUFFER, gl->fbo[i]); glBindFramebuffer(RARCH_GL_FRAMEBUFFER, gl->fbo[i]);
glFramebufferTexture2D(RARCH_GL_FRAMEBUFFER, glFramebufferTexture2D(RARCH_GL_FRAMEBUFFER,
RARCH_GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, gl->fbo_texture[i], 0); RARCH_GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, gl->fbo_texture[i], 0);
@ -447,6 +447,8 @@ static bool gl_create_fbo_targets(gl_t *gl)
if (gl->fbo_feedback_texture) if (gl->fbo_feedback_texture)
{ {
GLenum status;
glGenFramebuffers(1, &gl->fbo_feedback); glGenFramebuffers(1, &gl->fbo_feedback);
glBindFramebuffer(RARCH_GL_FRAMEBUFFER, gl->fbo_feedback); glBindFramebuffer(RARCH_GL_FRAMEBUFFER, gl->fbo_feedback);
glFramebufferTexture2D(RARCH_GL_FRAMEBUFFER, glFramebufferTexture2D(RARCH_GL_FRAMEBUFFER,
@ -631,7 +633,6 @@ void gl_renderchain_recompute_pass_sizes(gl_t *gl,
vp_width, vp_height vp_width, vp_height
); );
if (fbo_rect->img_width > (unsigned)max_size) if (fbo_rect->img_width > (unsigned)max_size)
{ {
size_modified = true; size_modified = true;
@ -805,7 +806,7 @@ void gl_renderchain_init(gl_t *gl, unsigned fbo_width, unsigned fbo_height)
} }
gl_create_fbo_textures(gl); gl_create_fbo_textures(gl);
if (!gl_create_fbo_targets(gl)) if (!gl || !gl_create_fbo_targets(gl))
{ {
glDeleteTextures(gl->fbo_pass, gl->fbo_texture); glDeleteTextures(gl->fbo_pass, gl->fbo_texture);
RARCH_ERR("[GL]: Failed to create FBO targets. Will continue without FBO.\n"); RARCH_ERR("[GL]: Failed to create FBO targets. Will continue without FBO.\n");