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

Remove GLSM_CTL_IS_FRAMEBUFFER_LOCKED

Browse Source
This commit is contained in:
twinaphex 2016-05-16 06:02:03 +02:00
parent 8de39f261c
commit 1983604134
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libretro-common/glsm/glsm.c
View File

@ -176,7 +176,6 @@ struct gl_cached_state
int cap_translate[SGL_CAP_MAX];
};
static glsm_framebuffer_lock glsm_fb_lock = NULL;
static struct retro_hw_render_callback hw_render;
static struct gl_cached_state gl_state;
@ -1418,11 +1417,8 @@ void rglGenFramebuffers(GLsizei n, GLuint *ids)
void rglBindFramebuffer(GLenum target, GLuint framebuffer)
{
glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
if (!glsm_ctl(GLSM_CTL_IS_FRAMEBUFFER_LOCKED, NULL))
{
glBindFramebuffer(target, framebuffer);
gl_state.framebuf = framebuffer;
}
glBindFramebuffer(target, framebuffer);
gl_state.framebuf = framebuffer;
}
/*
@ -1923,12 +1919,6 @@ static void glsm_state_unbind(void)
glBindFramebuffer(RARCH_GL_FRAMEBUFFER, 0);
}
static bool dummy_framebuffer_lock(void *data)
{
(void)data;
return false;
}
static bool glsm_state_ctx_init(void *data)
{
glsm_ctx_params_t *params = (glsm_ctx_params_t*)data;
@ -1962,10 +1952,6 @@ static bool glsm_state_ctx_init(void *data)
hw_render.bottom_left_origin = true;
hw_render.cache_context = true;
glsm_fb_lock = dummy_framebuffer_lock;
if (params->framebuffer_lock != NULL)
glsm_fb_lock = params->framebuffer_lock;
if (!params->environ_cb(RETRO_ENVIRONMENT_SET_HW_RENDER, &hw_render))
return false;
@ -1981,8 +1967,6 @@ bool glsm_ctl(enum glsm_state_ctl state, void *data)
{
switch (state)
{
case GLSM_CTL_IS_FRAMEBUFFER_LOCKED:
return glsm_fb_lock(NULL);
case GLSM_CTL_IMM_VBO_DRAW:
return false;
case GLSM_CTL_IMM_VBO_DISABLE:

1
libretro-common/include/glsm/glsm.h
View File

@ -123,7 +123,6 @@ enum glsm_state_ctl
GLSM_CTL_UNSET_IMM_VBO,
GLSM_CTL_IMM_VBO_DISABLE,
GLSM_CTL_IMM_VBO_DRAW,
GLSM_CTL_IS_FRAMEBUFFER_LOCKED,
GLSM_CTL_PROC_ADDRESS_GET
};