From 1a4c122310803512f8a5eb53f9a6f5f5433789fa Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 27 May 2012 18:46:20 +0200 Subject: [PATCH] (PS3) Don't use custom type macros in ps3_video_psgl.c anymore --- gfx/gl_common.h | 7 +++++++ ps3/ps3_video_psgl.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gfx/gl_common.h b/gfx/gl_common.h index a3dd4bcffa..df2115566f 100644 --- a/gfx/gl_common.h +++ b/gfx/gl_common.h @@ -199,10 +199,17 @@ extern PFNGLACTIVETEXTUREPROC pglActiveTexture; #define pglActiveTexture glActiveTexture #endif +#ifdef __CELLOS_LV2__ +#define RARCH_GL_INTERNAL_FORMAT GL_ARGB_SCE +#define RARCH_GL_TEXTURE_TYPE GL_ARGB_SCE +#define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8 +#define RARCH_GL_FORMAT16 GL_RGB5_A1 +#else #define RARCH_GL_INTERNAL_FORMAT GL_RGBA #define RARCH_GL_TEXTURE_TYPE GL_BGRA #define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8_REV #define RARCH_GL_FORMAT16 GL_UNSIGNED_SHORT_1_5_5_5_REV +#endif void gl_shader_use(unsigned index); void gl_set_projection(gl_t *gl, bool allow_rotate); diff --git a/ps3/ps3_video_psgl.c b/ps3/ps3_video_psgl.c index 338b884d62..e13f786acf 100644 --- a/ps3/ps3_video_psgl.c +++ b/ps3/ps3_video_psgl.c @@ -306,8 +306,9 @@ static void gl_create_fbo_textures(gl_t *gl) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter_type); glTexImage2D(GL_TEXTURE_2D, - 0, GL_ARGB_SCE, gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0, GL_ARGB_SCE, - GL_UNSIGNED_INT_8_8_8_8, NULL); + 0, RARCH_GL_INTERNAL_FORMAT, gl->fbo_rect[i].width, gl->fbo_rect[i].height, + 0, RARCH_GL_TEXTURE_TYPE, + RARCH_GL_FORMAT32, NULL); } glBindTexture(GL_TEXTURE_2D, 0);