From e1a3bf48fd89993106725b9101eaee84f157e6d5 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 27 May 2012 12:38:07 +0200 Subject: [PATCH] Use correlating ifdef. --- gfx/gl.c | 5 +++-- gfx/gl_common.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gfx/gl.c b/gfx/gl.c index d052f5c59f..48d1bdf071 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -910,7 +910,7 @@ static void gl_free(void *data) glDisableClientState(GL_COLOR_ARRAY); glDeleteTextures(TEXTURES, gl->texture); -#ifdef __CELLOS_LV2__ +#ifdef HAVE_OPENGL_TEXREF glBindBuffer(GL_TEXTURE_REFERENCE_BUFFER_SCE, 0); glDeleteBuffers(1, &gl->pbo); #endif @@ -1059,7 +1059,8 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo #ifdef HAVE_OPENGL_TEXREF glGenBuffers(1, &gl->pbo); glBindBuffer(GL_TEXTURE_REFERENCE_BUFFER_SCE, gl->pbo); - glBufferData(GL_TEXTURE_REFERENCE_BUFFER_SCE, gl->tex_w * gl->tex_h * gl->base_size * TEXTURES, NULL, GL_STREAM_DRAW); + glBufferData(GL_TEXTURE_REFERENCE_BUFFER_SCE, + gl->tex_w * gl->tex_h * gl->base_size * TEXTURES, NULL, GL_STREAM_DRAW); #endif // Empty buffer that we use to clear out the texture with on res change. diff --git a/gfx/gl_common.h b/gfx/gl_common.h index 800e8b946c..2c48ac9227 100644 --- a/gfx/gl_common.h +++ b/gfx/gl_common.h @@ -197,7 +197,7 @@ extern PFNGLACTIVETEXTUREPROC pglActiveTexture; #define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8_REV #define RARCH_GL_FORMAT16 GL_UNSIGNED_SHORT_1_5_5_5_REV -void gl_shader_use(unsigned); +void gl_shader_use(unsigned index); void gl_set_projection(gl_t *gl, bool allow_rotate); void gl_set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_full, bool allow_rotate);