Should allow fast path for PS3 on glTexImage2D.

This commit is contained in:
Themaister 2012-10-02 20:16:55 +02:00
parent 93be96b9d2
commit e351dcc59c
3 changed files with 5 additions and 10 deletions

View File

@ -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]);

View File

@ -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

View File

@ -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);
}