mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Some build fixes

Browse Source
This commit is contained in:
twinaphex 2016-12-10 09:39:07 +01:00
parent 31b69b4011
commit a210e4f6fe
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/drivers/gl.c
View File

@ -655,9 +655,11 @@ static void gl_init_textures(gl_t *gl, const video_info_t *video)
{ {
if (gl_check_capability(GL_CAPS_ARGB8)) if (gl_check_capability(GL_CAPS_ARGB8))
{ {
#if !defined(HAVE_PSGL)
if (gl_check_capability(GL_CAPS_GLES3_SUPPORTED)) if (gl_check_capability(GL_CAPS_GLES3_SUPPORTED))
internal_fmt = GL_RGBA8_OES; internal_fmt = GL_RGBA8_OES;
else else
#endif
internal_fmt = GL_RGBA; internal_fmt = GL_RGBA;
texture_type = GL_RGBA; texture_type = GL_RGBA;
texture_fmt = GL_UNSIGNED_BYTE; texture_fmt = GL_UNSIGNED_BYTE;

8
gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
View File

@ -163,7 +163,7 @@ static bool gl_recreate_fbo(
glDeleteTextures(1, texture); glDeleteTextures(1, texture);
glGenTextures(1, texture); glGenTextures(1, texture);
glBindTexture(GL_TEXTURE_2D, *texture); glBindTexture(GL_TEXTURE_2D, *texture);
#ifndef HAVE_OPENGLES2 #if !defined(HAVE_OPENGLES2) && !defined(HAVE_PSGL)
if (gl_check_capability(GL_CAPS_TEX_STORAGE)) if (gl_check_capability(GL_CAPS_TEX_STORAGE))
glTexStorage2D(GL_TEXTURE_2D, 1, RARCH_GL_INTERNAL_FORMAT32, glTexStorage2D(GL_TEXTURE_2D, 1, RARCH_GL_INTERNAL_FORMAT32,
fbo_rect->width, fbo_rect->height); fbo_rect->width, fbo_rect->height);
@ -524,14 +524,16 @@ static void gl_create_fbo_texture(gl_t *gl, unsigned i, GLuint texture)
RARCH_ERR("[GL]: Floating-point FBO was requested, but is not supported. Falling back to UNORM. Result may band/clip/etc.!\n"); RARCH_ERR("[GL]: Floating-point FBO was requested, but is not supported. Falling back to UNORM. Result may band/clip/etc.!\n");
} }
#ifndef HAVE_OPENGLES2 #if !defined(HAVE_OPENGLES2)
if (fp_fbo && gl->has_fp_fbo) if (fp_fbo && gl->has_fp_fbo)
{ {
RARCH_LOG("[GL]: FBO pass #%d is floating-point.\n", i); RARCH_LOG("[GL]: FBO pass #%d is floating-point.\n", i);
#if !defined(HAVE_PSGL)
if (gl_check_capability(GL_CAPS_TEX_STORAGE)) if (gl_check_capability(GL_CAPS_TEX_STORAGE))
glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32F, glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32F,
gl->fbo_rect[i].width, gl->fbo_rect[i].height); gl->fbo_rect[i].width, gl->fbo_rect[i].height);
else else
#endif
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F,
gl->fbo_rect[i].width, gl->fbo_rect[i].height, gl->fbo_rect[i].width, gl->fbo_rect[i].height,
0, GL_RGBA, GL_FLOAT, NULL); 0, GL_RGBA, GL_FLOAT, NULL);
@ -576,7 +578,7 @@ static void gl_create_fbo_texture(gl_t *gl, unsigned i, GLuint texture)
else else
#endif #endif
{ {
#ifdef HAVE_OPENGLES2 #if defined(HAVE_OPENGLES2) || defined(HAVE_PSGL)
glTexImage2D(GL_TEXTURE_2D, glTexImage2D(GL_TEXTURE_2D,
0, GL_RGBA, 0, GL_RGBA,
gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0, gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0,