CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-21 03:50:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(zr_common.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-04-15 07:45:59 +02:00
parent 9d85afd358
commit 6f6330576c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/drivers/zr_common.c
View File

@ -250,12 +250,13 @@ void zr_common_device_draw(struct zr_device *dev,
video_shader_ctx_info_t shader_info;
struct zr_buffer vbuf, ebuf;
struct zr_convert_config config;
uintptr_t last_prog;
const struct zr_draw_command *cmd = NULL;
void *vertices = NULL;
void *elements = NULL;
const zr_draw_index *offset = NULL;
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
GLint last_prog, last_tex;
GLint last_tex;
GLint last_ebo, last_vbo, last_vao;
GLfloat ortho[4][4] = {
{2.0f, 0.0f, 0.0f, 0.0f},
@ -267,7 +268,7 @@ void zr_common_device_draw(struct zr_device *dev,
ortho[1][1] /= (GLfloat)height;
/* save previous opengl state */
glGetIntegerv(GL_CURRENT_PROGRAM, &last_prog);
glGetIntegerv(GL_CURRENT_PROGRAM, (GLint*)&last_prog);
glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_tex);
glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &last_vao);
glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &last_ebo);
@ -345,7 +346,7 @@ void zr_common_device_draw(struct zr_device *dev,
/* restore old state */
shader_info.data = NULL;
shader_info.idx = last_prog;
shader_info.idx = (GLint)last_prog;
shader_info.set_active = false;
video_shader_driver_ctl(SHADER_CTL_USE, &shader_info);