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

Fix ifdefs regarding READ_PIXELS.

Browse Source
This commit is contained in:
Themaister 2014-01-05 22:21:11 +01:00
parent 144ee18ed3
commit bee70f8318
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/gl.c
View File

@ -2342,7 +2342,6 @@ static bool gl_set_shader(void *data, enum rarch_shader_type type, const char *p
} }
#endif #endif
#ifndef NO_GL_READ_VIEWPORT
static void gl_viewport_info(void *data, struct rarch_viewport *vp) static void gl_viewport_info(void *data, struct rarch_viewport *vp)
{ {
gl_t *gl = (gl_t*)data; gl_t *gl = (gl_t*)data;
@ -2356,6 +2355,7 @@ static void gl_viewport_info(void *data, struct rarch_viewport *vp)
vp->y = top_dist; vp->y = top_dist;
} }
#ifndef NO_GL_READ_PIXELS
static bool gl_read_viewport(void *data, uint8_t *buffer) static bool gl_read_viewport(void *data, uint8_t *buffer)
{ {
unsigned i; unsigned i;
@ -2370,7 +2370,6 @@ static bool gl_read_viewport(void *data, uint8_t *buffer)
gl_bind_backbuffer(); gl_bind_backbuffer();
#endif #endif
#ifndef NO_GL_READ_PIXELS
#ifdef HAVE_OPENGLES #ifdef HAVE_OPENGLES
glPixelStorei(GL_PACK_ALIGNMENT, get_alignment(gl->vp.width * 3)); glPixelStorei(GL_PACK_ALIGNMENT, get_alignment(gl->vp.width * 3));
// GLES doesn't support glReadBuffer ... Take a chance that it'll work out right. // GLES doesn't support glReadBuffer ... Take a chance that it'll work out right.
@ -2417,7 +2416,6 @@ static bool gl_read_viewport(void *data, uint8_t *buffer)
gl->vp.width, gl->vp.height, gl->vp.width, gl->vp.height,
GL_BGR, GL_UNSIGNED_BYTE, buffer); GL_BGR, GL_UNSIGNED_BYTE, buffer);
} }
#endif
#endif #endif
RARCH_PERFORMANCE_STOP(read_viewport); RARCH_PERFORMANCE_STOP(read_viewport);
@ -2746,12 +2744,12 @@ const video_driver_t video_gl = {
#endif #endif
gl_set_rotation, gl_set_rotation,
#ifndef NO_GL_READ_VIEWPORT
gl_viewport_info, gl_viewport_info,
#ifndef NO_GL_READ_PIXELS
gl_read_viewport, gl_read_viewport,
#else #else
NULL, NULL,
NULL,
#endif #endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY