Fix missed C2D function for multiple shader support

This took so long to debug...

Author: TheGag96

source/base.c

@@ -204,9 +204,7 @@ void C2D_Flush(void)
 
 void C2D_SceneSize(u32 width, u32 height, bool tilt)
 {
-	C2Di_Context* ctx = C2Di_GetContext();
-	if (!(ctx->flags & C2DiF_Active))
-		return;
+	C3D_Mtx projResult;
 
 	if (tilt)
 	{
@@ -215,27 +213,40 @@ void C2D_SceneSize(u32 width, u32 height, bool tilt)
 		height = temp;
 	}
 
-	ctx->flags |= C2DiF_DirtyProj;
-	ctx->sceneW = width;
-	ctx->sceneH = height;
+	bool constructed = false;
 
 	// Check for cached projection matrices
 	if (height == GSP_SCREEN_WIDTH && tilt)
 	{
 		if (width == GSP_SCREEN_HEIGHT_TOP || width == GSP_SCREEN_HEIGHT_TOP_2X)
 		{
-			Mtx_Copy(&ctx->projMtx, &s_projTop);
-			return;
+			Mtx_Copy(&projResult, &s_projTop);
+			constructed = true;
 		}
 		else if (width == GSP_SCREEN_HEIGHT_BOTTOM)
 		{
-			Mtx_Copy(&ctx->projMtx, &s_projBot);
-			return;
+			Mtx_Copy(&projResult, &s_projBot);
+			constructed = true;
 		}
 	}
 
 	// Construct the projection matrix
-	(tilt ? Mtx_OrthoTilt : Mtx_Ortho)(&ctx->projMtx, 0.0f, width, height, 0.0f, 1.0f, -1.0f, true);
+	if (!constructed) {
+		(tilt ? Mtx_OrthoTilt : Mtx_Ortho)(&projResult, 0.0f, width, height, 0.0f, 1.0f, -1.0f, true);
+	}
+
+	for (int shaderId = 0; shaderId < C2D_NUM_SHADERS; shaderId++) {
+		C2Di_Context* ctx = &__C2Di_Contexts[shaderId];
+
+		if (!(ctx->flags & C2DiF_Active))
+			continue;
+
+		ctx->flags |= C2DiF_DirtyProj;
+		ctx->sceneW = width;
+		ctx->sceneH = height;
+
+		Mtx_Copy(&ctx->projMtx, &projResult);
+	}
 }
 
 void C2D_ViewReset(void)

source/main.c

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include "program_shbin.h"
 
-static int uLoc_offsets;
+static int uLoc_offsets = -1;
 
 float gameTime      = 0;
 float timeStep      = 0.08;
@@ -62,6 +62,10 @@ static void buildScanlineOffsetTable(void)
   else if (gameTime < -2*M_PI) gameTime += 2*M_PI;
 
   // Update the uniforms
+  if (uLoc_offsets == -1) {
+    C2Di_Context* ctx = C2Di_GetContext();
+    uLoc_offsets = shaderInstanceGetUniformLocation(ctx->program.geometryShader, "offsets");
+  }
   C3D_FVUnifMtxNx4(GPU_GEOMETRY_SHADER, uLoc_offsets, (C3D_Mtx*) offsetTable, NUM_OFFSETS/4);
 }
 
@@ -147,7 +151,7 @@ int main()
   gfxInitDefault();
   C3D_Init(C3D_DEFAULT_CMDBUF_SIZE);
   C2D_Init(C2D_DEFAULT_MAX_OBJECTS/2);
-  C2D_Prepare(C2D_ScanlineOffset);
+  C2D_Prepare(C2D_Normal);
   consoleInit(GFX_BOTTOM, NULL);
 
   // Create screens
@@ -163,9 +167,6 @@ int main()
     C2D_SpriteFromSheet(&sprites[i], spriteSheet, i);
   }
 
-  C2Di_Context* ctx = C2Di_GetContext();
-  uLoc_offsets = shaderInstanceGetUniformLocation(ctx->program.geometryShader, "offsets");
-
   // Main loop
   while (aptMainLoop())
   {
@@ -210,6 +211,7 @@ int main()
     C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
     C2D_TargetClear(top, C2D_Color32f(0.3f, 0.7f, 1.0f, 1.0f));
     C2D_SceneBegin(top);
+    // C2D_SceneTarget(top);
     C2D_Prepare(C2D_ScanlineOffset);
     buildScanlineOffsetTable();