CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-24 19:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(GL) Refactors pt. 2

Browse Source
This commit is contained in:
twinaphex 2014-10-01 19:34:55 +02:00
parent e7e43a5c59
commit 52d7ac54ec
1 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
gfx/gl.c
View File

@ -330,16 +330,8 @@ void gl_shader_set_coords(gl_t *gl, const struct gl_coords *coords, const math_m
if (!gl) if (!gl)
return; return;
bool ret_coords = false; bool ret_coords = (gl->shader) ? gl->shader->set_coords(coords) : false;
bool ret_mvp = false; bool ret_mvp = (gl->shader) ? gl->shader->set_mvp(gl, mat) : false;
(void)ret_coords;
(void)ret_mvp;
if (gl->shader)
ret_coords = gl->shader->set_coords(coords);
if (gl->shader)
ret_mvp = gl->shader->set_mvp(gl, mat);
// Fall back to FF-style if needed and possible. // Fall back to FF-style if needed and possible.
#ifndef NO_GL_FF_VERTEX #ifndef NO_GL_FF_VERTEX
@ -479,8 +471,9 @@ static void gl_create_fbo_textures(gl_t *gl)
glGenTextures(gl->fbo_pass, gl->fbo_texture); glGenTextures(gl->fbo_pass, gl->fbo_texture);
GLuint base_filt = g_settings.video.smooth ? GL_LINEAR : GL_NEAREST; GLuint base_filt = g_settings.video.smooth ? GL_LINEAR : GL_NEAREST;
GLuint base_mip_filt = g_settings.video.smooth ? GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST; GLuint base_mip_filt = g_settings.video.smooth ?
GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST;
for (i = 0; i < gl->fbo_pass; i++) for (i = 0; i < gl->fbo_pass; i++)
{ {
@ -784,6 +777,8 @@ static bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height)
void gl_set_projection(gl_t *gl, struct gl_ortho *ortho, bool allow_rotate) void gl_set_projection(gl_t *gl, struct gl_ortho *ortho, bool allow_rotate)
{ {
math_matrix rot;
if (!gl) if (!gl)
return; return;
@ -791,14 +786,14 @@ void gl_set_projection(gl_t *gl, struct gl_ortho *ortho, bool allow_rotate)
matrix_ortho(&gl->mvp_no_rot, ortho->left, ortho->right, matrix_ortho(&gl->mvp_no_rot, ortho->left, ortho->right,
ortho->bottom, ortho->top, ortho->znear, ortho->zfar); ortho->bottom, ortho->top, ortho->znear, ortho->zfar);
if (allow_rotate) if (!allow_rotate)
{ {
math_matrix rot;
matrix_rotate_z(&rot, M_PI * gl->rotation / 180.0f);
matrix_multiply(&gl->mvp, &rot, &gl->mvp_no_rot);
}
else
gl->mvp = gl->mvp_no_rot; gl->mvp = gl->mvp_no_rot;
return;
}
matrix_rotate_z(&rot, M_PI * gl->rotation / 180.0f);
matrix_multiply(&gl->mvp, &rot, &gl->mvp_no_rot);
} }
void gl_set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_full, bool allow_rotate) void gl_set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_full, bool allow_rotate)
@ -904,16 +899,16 @@ static void gl_set_rotation(void *data, unsigned rotation)
#ifdef HAVE_FBO #ifdef HAVE_FBO
static inline void gl_start_frame_fbo(gl_t *gl) static inline void gl_start_frame_fbo(gl_t *gl)
{ {
if (!gl)
return;
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]); glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
glBindFramebuffer(RARCH_GL_FRAMEBUFFER, gl->fbo[0]); glBindFramebuffer(RARCH_GL_FRAMEBUFFER, gl->fbo[0]);
gl_set_viewport(gl, gl->fbo_rect[0].img_width, gl->fbo_rect[0].img_height, true, false);
// Need to preserve the "flipped" state when in FBO as well to have gl_set_viewport(gl, gl->fbo_rect[0].img_width,
// consistent texture coordinates. gl->fbo_rect[0].img_height, true, false);
// We will "flip" it in place on last pass.
/* Need to preserve the "flipped" state when in FBO
* as well to have consistent texture coordinates.
*
* We will "flip" it in place on last pass. */
gl->coords.vertex = vertexes; gl->coords.vertex = vertexes;
#if defined(GL_FRAMEBUFFER_SRGB) && !defined(HAVE_OPENGLES) #if defined(GL_FRAMEBUFFER_SRGB) && !defined(HAVE_OPENGLES)
@ -1078,21 +1073,6 @@ static void gl_frame_fbo(gl_t *gl, const struct gl_tex_info *tex_info)
} }
#endif #endif
static void gl_update_resize(gl_t *gl)
{
#ifdef HAVE_FBO
if (gl && gl->fbo_inited)
{
gl_check_fbo_dimensions(gl);
// Go back to what we're supposed to do, render to FBO #0 :D
gl_start_frame_fbo(gl);
return;
}
#endif
gl_set_viewport(gl, gl->win_width, gl->win_height, false, true);
}
static void gl_update_input_size(gl_t *gl, unsigned width, unsigned height, unsigned pitch, bool clear) static void gl_update_input_size(gl_t *gl, unsigned width, unsigned height, unsigned pitch, bool clear)
{ {
bool set_coords = false; bool set_coords = false;
@ -1507,8 +1487,20 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
gl->should_resize = false; gl->should_resize = false;
context_set_resize_func(gl, gl->win_width, gl->win_height); context_set_resize_func(gl, gl->win_width, gl->win_height);
// On resize, we might have to recreate our FBOs due to "Viewport" scale, and set a new viewport. /* On resize, we might have to recreate our FBOs
gl_update_resize(gl); * due to "Viewport" scale, and set a new viewport. */
#ifdef HAVE_FBO
if (gl->fbo_inited)
{
gl_check_fbo_dimensions(gl);
/* Go back to what we're supposed to do,
* render to FBO #0. */
gl_start_frame_fbo(gl);
}
else
#endif
gl_set_viewport(gl, gl->win_width, gl->win_height, false, true);
} }
gl->tex_index = frame ? ((gl->tex_index + 1) % gl->textures) : (gl->tex_index); gl->tex_index = frame ? ((gl->tex_index + 1) % gl->textures) : (gl->tex_index);