From d932c8cbb5091144a7d557fe24ffac05d835e8d6 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 4 Oct 2023 23:40:49 +1100 Subject: [PATCH] PS3: Texturing at least works now --- src/Graphics_PS3.c | 8 ++++---- src/Program.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Graphics_PS3.c b/src/Graphics_PS3.c index d444c23fd..2d8b02198 100644 --- a/src/Graphics_PS3.c +++ b/src/Graphics_PS3.c @@ -86,8 +86,8 @@ static void FP_Load(FragmentProgram* fp, const u8* source) { } static void LoadFragmentPrograms(void) { - FP_Load(&FP_list[0], ps_textured_fpo); - FP_Load(&FP_list[1], ps_coloured_fpo); + FP_Load(&FP_list[0], ps_coloured_fpo); + FP_Load(&FP_list[1], ps_textured_fpo); } static void FP_SwitchActive(void) { @@ -526,8 +526,8 @@ void Gfx_BindTexture(GfxResourceID texId) { texture.format = GCM_TEXTURE_FORMAT_A8R8G8B8 | GCM_TEXTURE_FORMAT_LIN; texture.mipmap = 1; texture.dimension = GCM_TEXTURE_DIMS_2D; - texture.cubemap = GCM_FALSE; - texture.remap = ((GCM_TEXTURE_REMAP_TYPE_REMAP << GCM_TEXTURE_REMAP_TYPE_B_SHIFT) | + texture.cubemap = GCM_FALSE; + texture.remap = ((GCM_TEXTURE_REMAP_TYPE_REMAP << GCM_TEXTURE_REMAP_TYPE_B_SHIFT) | (GCM_TEXTURE_REMAP_TYPE_REMAP << GCM_TEXTURE_REMAP_TYPE_G_SHIFT) | (GCM_TEXTURE_REMAP_TYPE_REMAP << GCM_TEXTURE_REMAP_TYPE_R_SHIFT) | (GCM_TEXTURE_REMAP_TYPE_REMAP << GCM_TEXTURE_REMAP_TYPE_A_SHIFT) | diff --git a/src/Program.c b/src/Program.c index e16043dbb..988e33007 100644 --- a/src/Program.c +++ b/src/Program.c @@ -138,7 +138,7 @@ void android_main(void) { SetupProgram(0, NULL); for (;;) { RunProgram(0, NULL); } } -#elif defined CC_BUILD_3DS || defined CC_BUILD_PSP || defined CC_BUILD_GCWII || defined CC_BUILD_DREAMCAST || defined CC_BUILD_XBOX || defined CC_BUILD_PSVITA +#elif defined CC_BUILD_3DS || defined CC_BUILD_PSP || defined CC_BUILD_GCWII || defined CC_BUILD_DREAMCAST || defined CC_BUILD_XBOX || defined CC_BUILD_PSVITA || defined CC_BUILD_PS3 int main(int argc, char** argv) { SetupProgram(argc, argv); while (WindowInfo.Exists) {