From 7ba26db5e7a17f4a7308a924112ad6caaf9b669c Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Mon, 16 Jul 2012 22:22:05 +0200
Subject: [PATCH] (PSL1GHT) Attempt to compile RGL driver with PSL1GHT

---
 Makefile.psl1ght               | 15 ++++++++++++---
 console/rgl/ps3/device_ctx.cpp | 10 ++++++++++
 console/rgl/ps3/rgl.h          |  4 ++++
 ps3/sdk_defines.h              | 29 +++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index 360371a0ac..885b01a8f4 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -11,6 +11,7 @@ PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
 PC_DEVELOPMENT_UDP_PORT		= 3490
 
 CC = $(PS3DEV)/ppu/bin/ppu-gcc
+CXX = $(PS3DEV)/ppu/bin/ppu-g++
 LD = $(PS3DEV)/ppu/bin/ppu-ld
 
 ELF_TARGET := retroarch_psl1ght.elf
@@ -19,12 +20,14 @@ INCLUDE := -I. -I$(PS3DEV)/ppu/include
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
 
 MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
+CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
 LIBS := -lretro_psl1ght -laudio -lEGL -lGL -lio -lm -ljpgdec -lpngdec -lsysutil
 
 OBJ = console/griffin/griffin.o console/rzlib/rzlib.o
 
+#OBJ += console/rgl/ps3/device_ctx.o console/rgl/ps3/rgl.o console/rgl/ps3/cgbio.o console/rgl/ps3/cgnv2rt.o
+
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
@@ -37,12 +40,15 @@ endif
 
 RSXGL_DEFINES = -D__RSX__ -DGL3_PROTOTYPES
 
-CFLAGS += -std=gnu99 -DHAVE_FILEBROWSER $(RSXGL_DEFINES) -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.6\" -Dmain=rarch_main -Wno-char-subscripts 
+SHARED_FLAGS := -DHAVE_FILEBROWSER $(RSXGL_DEFINES) -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.6\" -Dmain=rarch_main -Wno-char-subscripts
+CFLAGS += -std=gnu99 $(SHARED_FLAGS)
+CXXFLAGS += $(SHARED_FLAGS)
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
 else
-   CLFAGS += -O3
+   CFLAGS += -O3
+   CXXFLAGS += -03
 endif
 
 all: $(ELF_TARGET)
@@ -53,6 +59,9 @@ $(ELF_TARGET): $(OBJ)
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
+%.o: %.cpp
+	$(CXX) $(CFLAGS) -c -o $@ $<
+
 clean:
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)
diff --git a/console/rgl/ps3/device_ctx.cpp b/console/rgl/ps3/device_ctx.cpp
index f2028956b4..967a51f911 100644
--- a/console/rgl/ps3/device_ctx.cpp
+++ b/console/rgl/ps3/device_ctx.cpp
@@ -2,11 +2,21 @@
 #include "rgl.h"
 #include "private.h"
 #include <string.h>
+#ifdef __PSL1GHT__
+#include <rsx/resc.h>
+#else
 #include <sdk_version.h>
 #include <cell/gcm.h>
 #include <cell/resc.h>
+#endif
+#include "../../../ps3/sdk_defines.h"
+
+#ifdef __PSL1GHT__
+#include <sysutil/sysutil.h>
+#else
 #include <sysutil/sysutil_sysparam.h>
 #include <sys/synchronization.h>
+#endif
 
 using namespace cell::Gcm;
 
diff --git a/console/rgl/ps3/rgl.h b/console/rgl/ps3/rgl.h
index e64ebf2134..b85fd5303a 100644
--- a/console/rgl/ps3/rgl.h
+++ b/console/rgl/ps3/rgl.h
@@ -5,7 +5,11 @@
 #include "glext.h"
 #include "base.hpp"
 
+#ifdef __PSL1GHT__
+#include <rsx/resc.h>
+#else
 #include <cell/resc.h>
+#endif
 
 #define RGL_ALIGN_FAST_TRANSFER 128
 #define _RGL_MAX_COLOR_ATTACHMENTS 4
diff --git a/ps3/sdk_defines.h b/ps3/sdk_defines.h
index 6ca3baaca7..7a659acb10 100644
--- a/ps3/sdk_defines.h
+++ b/ps3/sdk_defines.h
@@ -351,4 +351,33 @@
 #define sys_memory_container_destroy sysMemContainerDestroy
 #endif
 
+/*============================================================
+	RSX PROTOTYPES
+============================================================ */
+
+#ifdef __PSL1GHT__
+#define CELL_GCM_FALSE GCM_FALSE
+#define CELL_GCM_TRUE GCM_TRUE
+
+#define CELL_GCM_TEXTURE_NEAREST GCM_TEXTURE_NEAREST
+
+#define CELL_GCM_ONE GCM_ONE
+#define CELL_GCM_ZERO GCM_ZERO
+
+#define CELL_GCM_SMOOTH GCM_SMOOTH
+
+#define CellGcmSurface gcmSurface
+#define CellGcmTexture gcmTexture
+
+#define cellGcmSetWaitFlip gcmSetWaitFlip
+#define cellGcmFlush rsxFlushBuffer
+#define cellGcmSetFlipMode gcmSetFlipMode
+#define cellGcmSetFlip gcmSetFlip
+#define cellGcmGetLabelAddress gcmGetLabelAddress
+#define cellGcmUnbindTile gcmUnbindTile
+#define cellGcmBindTile gcmBindTile
+#define cellGcmSetTileInfo gcmSetTileInfo
+#define cellGcmAddressToOffset gcmAddressToOffset
+#endif
+
 #endif