diff --git a/gfx/gl.c b/gfx/gl.c index bdce346451..8ca1aaf1cb 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -456,13 +456,6 @@ static void gl_compute_fbo_geometry(void *data, unsigned width, unsigned height, } } -#ifdef __CELLOS_LV2__ -// TODO: Add float FBO support to PSGL -#define FP_FBO_ENABLE_DEFAULT (false) -#else -#define FP_FBO_ENABLE_DEFAULT (gl->fbo_scale[i].valid && gl->fbo_scale[i].fp_fbo) -#endif - static void gl_create_fbo_textures(void *data) { int i; @@ -488,7 +481,7 @@ static void gl_create_fbo_textures(void *data) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_enum); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_enum); - bool fp_fbo = FP_FBO_ENABLE_DEFAULT; + bool fp_fbo = gl->fbo_scale[i].valid && gl->fbo_scale[i].fp_fbo; if (fp_fbo) { diff --git a/ps3/rgl/src/rgl_ps3.cpp b/ps3/rgl/src/rgl_ps3.cpp index 66e91ae3c9..3597bd7ccf 100644 --- a/ps3/rgl/src/rgl_ps3.cpp +++ b/ps3/rgl/src/rgl_ps3.cpp @@ -3646,11 +3646,13 @@ static void rglSetImage(void *data, GLint internalFormat, GLsizei width, GLsizei static char* rglVendorString = "RetroArch"; static char* rglRendererString = "RGL"; -static char* rglExtensionsString = ""; +static char* rglExtensionsString = "GL_ARB_texture_float"; static char* rglVersionNumber = "2.00"; char* rglVersion = "2.00"; +#define NUM_EXTENSIONS 1 + RGLcontext* _CurrentContext = NULL; RGL_EXPORT RGLcontextHookFunction rglContextCreateHook = NULL; @@ -3677,6 +3679,11 @@ GLAPI void APIENTRY glGetIntegerv(GLenum pname, GLint* params) case GL_MAX_TEXTURE_SIZE: params[0] = RGLP_MAX_TEXTURE_SIZE; break; +#if 0 + case GL_NUM_EXTENSIONS: + params[0] = NUM_EXTENSIONS; + break; +#endif default: fprintf(stderr, "glGetIntegerv: enum not supported.\n"); break; diff --git a/ps3/rgl/src/rgl_ps3_raster.cpp b/ps3/rgl/src/rgl_ps3_raster.cpp index 02bb7d1308..3bde7ae8d7 100644 --- a/ps3/rgl/src/rgl_ps3_raster.cpp +++ b/ps3/rgl/src/rgl_ps3_raster.cpp @@ -2386,6 +2386,7 @@ source: RGLGCM_SURFACE_SOURCE_TEXTURE, } break; +#endif case RGLGCM_FLOAT_R32: // in_rgba = Rxxx, out_rgba = R001 { *gcmFormat = CELL_GCM_TEXTURE_X32_FLOAT; @@ -2402,6 +2403,7 @@ source: RGLGCM_SURFACE_SOURCE_TEXTURE, } break; +#if 0 case RGLGCM_RGB5_A1_SCE: // in_rgba = RGBA, out_rgba = RGBA { *gcmFormat = CELL_GCM_TEXTURE_A1R5G5B5;