Update PS3 support files

.github/workflows/build_ps3.yml

@@ -17,6 +17,7 @@ jobs:
         id: compile
         run: |
           pacman -S make --noconfirm
+          export PS3DEV=/usr/local/ps3dev
           make ps3
 
       - uses: ./.github/actions/notify_failure

misc/ps3/Makefile

@@ -3,11 +3,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(PS3DEV)),)
+$(error "Please set PS3DEV in your environment. export PS3DEV=<path>")
 endif
 
-include $(PSL1GHT)/ppu_rules
+include $(PS3DEV)/ppu_rules
 
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output

misc/ps3/vs_coloured.vcg

@@ -1,24 +1,11 @@
-struct vIn {
-	float4 color    : DIFFUSE;
-	float4 position : POSITION;
-};
-
-struct vOut {
-	float4 col : COLOR;
-	float4 pos : POSITION;
-};
-
-vOut main(
-	vIn              input,
-	uniform float4x4 mvp
-	)
+void main(
+	float4 in_position : POSITION,
+	float4 in_color    : DIFFUSE,
+	uniform float4x4 mvp,
+	out float4 out_pos   : POSITION, 
+	out float4 out_color : COLOR)
 {
-	vOut   result;
-	float4 position;
-
-	position = float4(input.position.xyz, 1.0f);
-
-	result.pos = mul(position, mvp);
-	result.col = input.color;
-	return result;
+	float4 pos = float4(in_position.xyz, 1.0f);	
+	out_pos    = mul(pos, mvp);
+	out_color  = in_color;
 }

misc/ps3/vs_offset.vcg

@@ -0,0 +1,15 @@
+void main(
+	float4 in_position : POSITION,
+	float4 in_color    : DIFFUSE,
+	float4 in_tex      : TEXCOORD,
+	uniform float4x4 mvp,
+	uniform float4 uv_offset,
+	out float4 out_pos   : POSITION, 
+	out float4 out_color : COLOR, 
+	out float2 out_tex   : TEXCOORD0)
+{
+	float4 pos = float4(in_position.xyz, 1.0f);	
+	out_pos    = mul(pos, mvp);
+	out_color  = in_color;
+	out_tex    = in_tex + uv_offset;
+}

misc/ps3/vs_textured.vcg

@@ -1,27 +1,14 @@
-struct vIn {
-	float4 tex      : TEXCOORD;
-	float4 color    : DIFFUSE;
-	float4 position : POSITION;
-};
-
-struct vOut {
-	float4 pos : POSITION;
-	float4 col : COLOR;
-	float4 tex : TEXCOORD0;
-};
-
-vOut main(
-	vIn              input,
-	uniform float4x4 mvp
-	)
+void main(
+	float4 in_position : POSITION,
+	float4 in_color    : DIFFUSE,
+	float4 in_tex      : TEXCOORD,
+	uniform float4x4 mvp,
+	out float4 out_pos   : POSITION, 
+	out float4 out_color : COLOR, 
+	out float2 out_tex   : TEXCOORD0)
 {
-	vOut   result;
-	float4 position;
-
-	position = float4(input.position.xyz, 1.0f);
-
-	result.pos = mul(position, mvp);
-	result.col = input.color;
-	result.tex = input.tex;
-	return result;
+	float4 pos = float4(in_position.xyz, 1.0f);	
+	out_pos    = mul(pos, mvp);
+	out_color  = in_color;
+	out_tex    = in_tex;
 }