From e351dcc59c5957b46301f41624f828e47d127a49 Mon Sep 17 00:00:00 2001 From: Themaister Date: Tue, 2 Oct 2012 20:16:55 +0200 Subject: [PATCH] Should allow fast path for PS3 on glTexImage2D. --- gfx/context/ps3_ctx.c | 5 +++-- gfx/gl_common.h | 4 ++-- gfx/shader_cg.c | 6 ------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c index f5167cdcce..40796849b3 100644 --- a/gfx/context/ps3_ctx.c +++ b/gfx/context/ps3_ctx.c @@ -219,8 +219,9 @@ static bool gfx_ctx_menu_init(void) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, GL_ARGB_SCE, menu_texture.width, menu_texture.height, 0, - GL_ARGB_SCE, GL_UNSIGNED_INT_8_8_8_8, menu_texture.pixels); + glTexImage2D(GL_TEXTURE_2D, 0, RARCH_GL_INTERNAL_FORMAT, + menu_texture.width, menu_texture.height, 0, + RARCH_GL_TEXTURE_TYPE, RARCH_GL_FORMAT32, menu_texture.pixels); glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]); diff --git a/gfx/gl_common.h b/gfx/gl_common.h index 22dbe36d00..2377d57146 100644 --- a/gfx/gl_common.h +++ b/gfx/gl_common.h @@ -246,8 +246,8 @@ extern PFNGLACTIVETEXTUREPROC pglActiveTexture; #if defined(HAVE_PSGL) #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_TEXTURE_TYPE GL_BGRA +#define RARCH_GL_FORMAT32 GL_UNSIGNED_INT_8_8_8_8_REV #define RARCH_GL_FORMAT16 GL_RGB5_A1 #elif defined(HAVE_OPENGLES) #define RARCH_GL_INTERNAL_FORMAT GL_BGRA_EXT diff --git a/gfx/shader_cg.c b/gfx/shader_cg.c index 7a9d562f83..0d44c723a9 100644 --- a/gfx/shader_cg.c +++ b/gfx/shader_cg.c @@ -517,16 +517,10 @@ static void load_texture_data(GLuint *obj, const struct texture_image *img, bool glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, smooth ? GL_LINEAR : GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, smooth ? GL_LINEAR : GL_NEAREST); -#ifdef __CELLOS_LV2__ - glTexImage2D(GL_TEXTURE_2D, - 0, GL_ARGB_SCE, img->width, img->height, - 0, GL_ARGB_SCE, GL_UNSIGNED_INT_8_8_8_8, img->pixels); -#else glPixelStorei(GL_UNPACK_ALIGNMENT, 4); glTexImage2D(GL_TEXTURE_2D, 0, RARCH_GL_INTERNAL_FORMAT, img->width, img->height, 0, RARCH_GL_TEXTURE_TYPE, RARCH_GL_FORMAT32, img->pixels); -#endif free(img->pixels); }