(PS3) If HAVE_RGL is defined, GL render subsystem will not be

built in
This commit is contained in:
twinaphex 2013-03-30 15:39:00 +01:00
parent 5482986554
commit 454c329746

View File

@ -732,6 +732,7 @@ void gl_init_fbo(void *data, unsigned width, unsigned height)
gl->fbo_inited = true; gl->fbo_inited = true;
} }
#ifndef HAVE_RGL
bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height) bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height)
{ {
RARCH_LOG("[GL]: Initializing HW render (%u x %u).\n", width, height); RARCH_LOG("[GL]: Initializing HW render (%u x %u).\n", width, height);
@ -794,6 +795,7 @@ bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height)
return true; return true;
} }
#endif #endif
#endif
void gl_set_projection(void *data, struct gl_ortho *ortho, bool allow_rotate) void gl_set_projection(void *data, struct gl_ortho *ortho, bool allow_rotate)
{ {
@ -1657,6 +1659,7 @@ static void gl_free(void *data)
#ifdef HAVE_FBO #ifdef HAVE_FBO
gl_deinit_fbo(gl); gl_deinit_fbo(gl);
#ifndef HAVE_RGL
if (gl->hw_render_fbo_init) if (gl->hw_render_fbo_init)
pglDeleteFramebuffers(TEXTURES, gl->hw_render_fbo); pglDeleteFramebuffers(TEXTURES, gl->hw_render_fbo);
if (gl->hw_render_depth) if (gl->hw_render_depth)
@ -1664,6 +1667,7 @@ static void gl_free(void *data)
if (gl->hw_render_stencil) if (gl->hw_render_stencil)
pglDeleteRenderbuffers(TEXTURES, gl->hw_render_stencil); pglDeleteRenderbuffers(TEXTURES, gl->hw_render_stencil);
gl->hw_render_fbo_init = false; gl->hw_render_fbo_init = false;
#endif
#endif #endif
context_destroy_func(); context_destroy_func();
@ -2018,7 +2022,9 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
#else #else
enum retro_hw_context_type desired = RETRO_HW_CONTEXT_OPENGL; enum retro_hw_context_type desired = RETRO_HW_CONTEXT_OPENGL;
#endif #endif
(void)desired;
#ifndef HAVE_RGL
if (g_extern.system.hw_render_callback.context_type == desired if (g_extern.system.hw_render_callback.context_type == desired
&& !gl_init_hw_render(gl, gl->tex_w, gl->tex_h)) && !gl_init_hw_render(gl, gl->tex_w, gl->tex_h))
{ {
@ -2026,6 +2032,7 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
free(gl); free(gl);
return NULL; return NULL;
} }
#endif
#endif #endif
if (input && input_data) if (input && input_data)