From 483a361e72d905c5910ebff122e79a0938c39081 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Thu, 13 Sep 2012 17:11:23 +0200 Subject: [PATCH] (PS3) Commits - still broken --- Makefile.ps3 | 2 +- Makefile.ps3.retroarch | 2 +- Makefile.ps3.salamander | 2 +- console/rgl/ps3/cg.h | 2 +- console/rgl/ps3/rgl.cpp | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.ps3 b/Makefile.ps3 index e2142a2af5..bb9462200b 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -80,7 +80,7 @@ endif PPU_LDLIBS = -ldbgfont $(GL_LIBS) -lretroarch_ps3 -lretro_ps3 -lcgc -lgcm_cmd -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread -DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_PSGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_PSGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_PBO -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g diff --git a/Makefile.ps3.retroarch b/Makefile.ps3.retroarch index b0ae9aa14a..b9a36c3448 100644 --- a/Makefile.ps3.retroarch +++ b/Makefile.ps3.retroarch @@ -56,7 +56,7 @@ endif PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe -DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_RMENU -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_PSGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES1 -DHAVE_CG -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_RMENU -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_PSGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES1 -DHAVE_PBO -DHAVE_CG -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index dc36bcfcaa..73daf2be1d 100644 --- a/Makefile.ps3.salamander +++ b/Makefile.ps3.salamander @@ -18,7 +18,7 @@ endif STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe -PPU_CFLAGS += -I. -D__CELLOS_LV2__ -DIS_SALAMANDER +PPU_CFLAGS += -I. -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE PPU_SRCS = ps3/salamander/main.c console/rarch_console_exec.c console/rarch_console_libretro_mgmt.c file_path.c compat/compat.c conf/config_file.c ifeq ($(HAVE_LOGGER), 1) diff --git a/console/rgl/ps3/cg.h b/console/rgl/ps3/cg.h index 75c75c9a5d..2683cacc10 100644 --- a/console/rgl/ps3/cg.h +++ b/console/rgl/ps3/cg.h @@ -352,7 +352,7 @@ inline static CGresource _RGLGetBaseResource( CGresource resource ) case CG_UNDEFINED: return CG_UNDEFINED; default: - RARCH_WARN("Resource 0x%d is unknown here.\n", resource ); + //RARCH_WARN("Resource 0x%d is unknown here.\n", resource ); return CG_UNDEFINED; } } diff --git a/console/rgl/ps3/rgl.cpp b/console/rgl/ps3/rgl.cpp index a6d97b49c2..aaa6d9148d 100644 --- a/console/rgl/ps3/rgl.cpp +++ b/console/rgl/ps3/rgl.cpp @@ -4580,7 +4580,7 @@ static GLboolean _RGLPlatformTexturePBOImage( const GLuint pboPitch = _RGLPad(_RGLGetPixelSize(format, type) * width, LContext->unpackAlignment ); if (( pboPitch&3 ) != 0 ) { - RARCH_WARN("PBO image pitch not a multiple of 4, using slow path.\n" ); + //RARCH_WARN("PBO image pitch not a multiple of 4, using slow path.\n" ); return GL_FALSE; } @@ -4589,7 +4589,7 @@ static GLboolean _RGLPlatformTexturePBOImage( if ( gmmIdToOffset(gpuId)+gpuIdOffset & 63 ) { - RARCH_WARN("PBO offset not 64-byte aligned, using slow path.\n"); + //RARCH_WARN("PBO offset not 64-byte aligned, using slow path.\n"); return GL_FALSE; } @@ -4617,13 +4617,13 @@ static GLboolean _RGLPlatformTexturePBOImage( if (!formatOK ) { - RARCH_WARN("PBO format/type requires conversion to texture internal format, using slow path.\n"); + //RARCH_WARN("PBO format/type requires conversion to texture internal format, using slow path.\n"); return GL_FALSE; } if (!_RGLTextureIsValid(texture)) { - RARCH_WARN("PBO transfering to incomplete texture, using slow path.\n"); + //RARCH_WARN("PBO transfering to incomplete texture, using slow path.\n"); return GL_FALSE; } @@ -5679,7 +5679,7 @@ static GLboolean _RGLPlatformNeedsConversion( const jsAttributeState* as, GLuint default: break; } - RARCH_WARN("Attribute %d needs conversion. Slow path ahead.\n", index); + //RARCH_WARN("Attribute %d needs conversion. Slow path ahead.\n", index); return GL_TRUE; } @@ -6651,7 +6651,7 @@ CG_API CGprogram cgCreateProgram( CGcontext ctx, if ( program_type == CG_BINARY ) { - RARCH_WARN("A binary shader is being loaded using a deprecated binary format. Please use the cgnv2elf tool to convert to the new, memory-saving, faster-loading format.\n"); + //RARCH_WARN("A binary shader is being loaded using a deprecated binary format. Please use the cgnv2elf tool to convert to the new, memory-saving, faster-loading format.\n"); } //convert from NV format to the runtime format