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

Start cutting down on HAVE_GL_ASYNC_READBACK ifdef

Browse Source
This commit is contained in:
twinaphex 2017-11-07 23:19:54 +01:00
parent 5ea63f3b08
commit 0f6a3c8f9d
3 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/common/gl_common.h
View File

@ -77,10 +77,8 @@ typedef struct gl
bool menu_texture_full_screen;
#endif
bool have_sync;
#ifdef HAVE_GL_ASYNC_READBACK
bool pbo_readback_valid[4];
bool pbo_readback_enable;
#endif
int version_major;
int version_minor;
@ -98,9 +96,7 @@ typedef struct gl
GLuint menu_texture;
#endif
GLuint vao;
#ifdef HAVE_GL_ASYNC_READBACK
GLuint pbo_readback[4];
#endif
GLuint texture[GFX_MAX_TEXTURES];
GLuint fbo[GFX_MAX_SHADERS];
GLuint fbo_texture[GFX_MAX_SHADERS];
@ -119,9 +115,7 @@ typedef struct gl
#ifdef HAVE_OVERLAY
unsigned overlays;
#endif
#ifdef HAVE_GL_ASYNC_READBACK
unsigned pbo_readback_index;
#endif
unsigned fence_count;
unsigned last_width[GFX_MAX_TEXTURES];
unsigned last_height[GFX_MAX_TEXTURES];
@ -142,9 +136,7 @@ typedef struct gl
#endif
struct video_tex_info tex_info;
#ifdef HAVE_GL_ASYNC_READBACK
struct scaler_ctx pbo_readback_scaler;
#endif
struct video_viewport vp;
math_matrix_4x4 mvp, mvp_no_rot;
struct video_coords coords;

43
gfx/drivers/gl.c
View File

@ -1081,7 +1081,6 @@ static struct video_shader *gl_get_current_shader(void *data)
return shader_info.data;
}
#if defined(HAVE_GL_ASYNC_READBACK)
static void gl_pbo_async_readback(gl_t *gl)
{
glBindBuffer(GL_PIXEL_PACK_BUFFER,
@ -1109,7 +1108,6 @@ static void gl_pbo_async_readback(gl_t *gl)
glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
}
#endif
static INLINE void gl_draw_texture(gl_t *gl, video_frame_info_t *video_info)
{
@ -1395,13 +1393,11 @@ static bool gl_frame(void *data, const void *frame,
gl->vp.width, gl->vp.height,
GL_RGBA, GL_UNSIGNED_BYTE, gl->readback_buffer_screenshot);
}
#ifdef HAVE_GL_ASYNC_READBACK
#ifdef HAVE_MENU
/* Don't readback if we're in menu mode. */
else if (gl->pbo_readback_enable && !gl->menu_texture_enable)
gl_pbo_async_readback(gl);
#endif
#endif
#endif
/* Disable BFI during fast forward, slow-motion,
@ -1520,13 +1516,11 @@ static void gl_free(void *data)
scaler_ctx_gen_reset(&gl->scaler);
#ifdef HAVE_GL_ASYNC_READBACK
if (gl->pbo_readback_enable)
{
glDeleteBuffers(4, gl->pbo_readback);
scaler_ctx_gen_reset(&gl->pbo_readback_scaler);
}
#endif
if (gl->renderchain_driver->free)
gl->renderchain_driver->free(gl);
@ -1707,11 +1701,8 @@ static INLINE void gl_set_texture_fmts(gl_t *gl, bool rgb32)
static void gl_init_pbo_readback(gl_t *gl)
{
unsigned i;
settings_t *settings = config_get_ptr();
bool *recording_enabled = recording_is_enabled();
#ifndef HAVE_OPENGLES3
struct scaler_ctx *scaler = NULL;
#endif
settings_t *settings = config_get_ptr();
/* Only bother with this if we're doing GPU recording.
* Check recording_is_enabled() and not
@ -1737,22 +1728,24 @@ static void gl_init_pbo_readback(gl_t *gl)
glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
#ifndef HAVE_OPENGLES3
scaler = &gl->pbo_readback_scaler;
scaler->in_width = gl->vp.width;
scaler->in_height = gl->vp.height;
scaler->out_width = gl->vp.width;
scaler->out_height = gl->vp.height;
scaler->in_stride = gl->vp.width * sizeof(uint32_t);
scaler->out_stride = gl->vp.width * 3;
scaler->in_fmt = SCALER_FMT_ARGB8888;
scaler->out_fmt = SCALER_FMT_BGR24;
scaler->scaler_type = SCALER_TYPE_POINT;
if (!scaler_ctx_gen_filter(scaler))
{
gl->pbo_readback_enable = false;
RARCH_ERR("[GL]: Failed to initialize pixel conversion for PBO.\n");
glDeleteBuffers(4, gl->pbo_readback);
struct scaler_ctx *scaler = &gl->pbo_readback_scaler;
scaler->in_width = gl->vp.width;
scaler->in_height = gl->vp.height;
scaler->out_width = gl->vp.width;
scaler->out_height = gl->vp.height;
scaler->in_stride = gl->vp.width * sizeof(uint32_t);
scaler->out_stride = gl->vp.width * 3;
scaler->in_fmt = SCALER_FMT_ARGB8888;
scaler->out_fmt = SCALER_FMT_BGR24;
scaler->scaler_type = SCALER_TYPE_POINT;
if (!scaler_ctx_gen_filter(scaler))
{
gl->pbo_readback_enable = false;
RARCH_ERR("[GL]: Failed to initialize pixel conversion for PBO.\n");
glDeleteBuffers(4, gl->pbo_readback);
}
}
#endif
}

8
gfx/drivers_renderchain/gl2_renderchain.c
View File

@ -1001,7 +1001,6 @@ static bool gl2_renderchain_read_viewport(
num_pixels = gl->vp.width * gl->vp.height;
#ifdef HAVE_GL_ASYNC_READBACK
if (gl->pbo_readback_enable)
{
const uint8_t *ptr = NULL;
@ -1049,10 +1048,11 @@ static bool gl2_renderchain_read_viewport(
glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
}
else /* Use slow synchronous readbacks. Use this with plain screenshots
as we don't really care about performance in this case. */
#endif
else
{
/* Use slow synchronous readbacks. Use this with plain screenshots
as we don't really care about performance in this case. */
/* GLES2 only guarantees GL_RGBA/GL_UNSIGNED_BYTE
* readbacks so do just that.
* GLES2 also doesn't support reading back data