mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Change HAVE_RGL to HAVE_GCMGL

Browse Source
This commit is contained in:
twinaphex 2014-02-25 22:01:46 +01:00
parent babbd68a33
commit fcf30143b4
7 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.ps3
View File

@ -12,7 +12,7 @@ RMENU_IMG_DIR := media/rmenu
DOWNLOAD_SHADERS = 1
STRIPPING_ENABLE = 0
DEBUG = 0
HAVE_RGL = 1
HAVE_GCMGL = 1
HAVE_LOGGER = 0
HAVE_FREETYPE = 0
HAVE_RLAUNCH = 0
@ -75,8 +75,8 @@ endif
DEFINES += -DHAVE_RMENU -DHAVE_MENU -DRARCH_INTERNAL
ifeq ($(HAVE_RGL), 1)
DEFINES += -DHAVE_RGL
ifeq ($(HAVE_GCMGL), 1)
DEFINES += -DHAVE_GCMGL
GL_LIBS := -L. -lrgl_ps3
else
GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc

6
Makefile.ps3.cobra
View File

@ -12,7 +12,7 @@ RMENU_IMG_DIR := media/rmenu
DOWNLOAD_SHADERS = 1
STRIPPING_ENABLE = 0
DEBUG = 0
HAVE_RGL = 1
HAVE_GCMGL = 1
HAVE_LOGGER = 0
HAVE_FREETYPE = 0
HAVE_RLAUNCH = 0
@ -75,8 +75,8 @@ endif
DEFINES += -DHAVE_RMENU -DHAVE_MENU -DRARCH_INTERNAL
ifeq ($(HAVE_RGL), 1)
DEFINES += -DHAVE_RGL
ifeq ($(HAVE_GCMGL), 1)
DEFINES += -DHAVE_GCMGL
GL_LIBS := -L. -lrgl_ps3
else
GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc

4
Makefile.ps3.rgl
View File

@ -50,10 +50,6 @@ else
PPU_OPTIMIZE_LV := -O3
endif
ifeq ($(RGL_2D), 1)
PPU_OPTIMIZE_LV += -DHAVE_RGL_2D
endif
PPU_CFLAGS = $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
PPU_CXXFLAGS = $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)

2
Makefile.psl1ght
View File

@ -90,7 +90,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
CFLAGS += -DHAVE_FILE_LOGGER
endif
SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_RGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts
SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts
CFLAGS += -std=gnu99 $(SHARED_FLAGS)
CXXFLAGS += $(SHARED_FLAGS)

10
gfx/gl.c
View File

@ -628,7 +628,7 @@ void gl_init_fbo(void *data, unsigned width, unsigned height)
gl->fbo_inited = true;
}
#ifndef HAVE_RGL
#ifndef HAVE_GCMGL
static void gl_deinit_hw_render(gl_t *gl)
{
if (gl->hw_render_fbo_init)
@ -1647,7 +1647,7 @@ static void gl_free(void *data)
#ifdef HAVE_FBO
gl_deinit_fbo(gl);
#ifndef HAVE_RGL
#ifndef HAVE_GCMGL
gl_deinit_hw_render(gl);
#endif
#endif
@ -2190,7 +2190,7 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
// Set up render to texture.
gl_init_fbo(gl, gl->tex_w, gl->tex_h);
#ifndef HAVE_RGL
#ifndef HAVE_GCMGL
if (gl->hw_render_use && !gl_init_hw_render(gl, gl->tex_w, gl->tex_h))
{
context_destroy_func();
@ -2335,7 +2335,7 @@ static bool gl_set_shader(void *data, enum rarch_shader_type type, const char *p
unsigned textures = gl->shader->get_prev_textures() + 1;
if (textures > gl->textures) // Have to reinit a bit.
{
#if defined(HAVE_FBO) && !defined(HAVE_RGL)
#if defined(HAVE_FBO) && !defined(HAVE_GCMGL)
gl_deinit_hw_render(gl);
#endif
@ -2350,7 +2350,7 @@ static bool gl_set_shader(void *data, enum rarch_shader_type type, const char *p
gl_init_textures(gl, &gl->video_info);
gl_init_textures_data(gl);
#if defined(HAVE_FBO) && !defined(HAVE_RGL)
#if defined(HAVE_FBO) && !defined(HAVE_GCMGL)
if (gl->hw_render_use)
gl_init_hw_render(gl, gl->tex_w, gl->tex_h);
#endif

2
gfx/gl_common.h
View File

@ -313,7 +313,7 @@ typedef struct gl
#define NO_GL_READ_PIXELS
// Performance hacks
#ifdef HAVE_RGL
#ifdef HAVE_GCMGL
extern GLvoid* glMapBufferTextureReferenceRA( GLenum target, GLenum access );
extern GLboolean glUnmapBufferTextureReferenceRA( GLenum target );
extern void glBufferSubDataTextureReferenceRA( GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data );

2
gfx/shader_cg.c
View File

@ -828,7 +828,7 @@ static bool gl_cg_init(const char *path)
RARCH_ERR("Invalid profile type\n");
goto error;
}
#ifndef HAVE_RGL
#ifndef HAVE_GCMGL
RARCH_LOG("[Cg]: Vertex profile: %s\n", cgGetProfileString(cgVProf));
RARCH_LOG("[Cg]: Fragment profile: %s\n", cgGetProfileString(cgFProf));
#endif