Move surfaceId to the RuntimeView itself

We still need to hook up the surfaceIds to ACTUALLY do something tho

Author: MrPowerGamerBR

src/runner.c

@@ -1304,6 +1304,7 @@ static void initRoom(Runner* runner, int32_t roomIndex) {
         copyRoomViewToRuntimeView(roomView, &runner->views[vi]);
         initDefaultCameraFromRoomView(&runner->defaultCameras[vi], roomView);
         runner->views[vi].cameraId = (int32_t) vi;
+        runner->views[vi].surfaceId = -1;
     }
 
     // Reset tile layer state for the new room
@@ -1868,9 +1869,6 @@ Runner* Runner_create(DataWin* dataWin, VMContext* vm, Renderer* renderer, FileS
     runner->keyboard = RunnerKeyboard_create();
     runner->gamepads = RunnerGamepad_create();
     runner->mouse = RunnerMouse_create();
-    repeat(8, i) {
-        runner->viewSurfaceIds[i] = -1;
-    }
     runner->appSurfaceEnabled = true;
     runner->appSurfaceAutoDraw = true;
     runner->usingAppSurface = true;
@@ -2421,7 +2419,7 @@ void Runner_getMouseRoomPosition(Runner* runner, GMLReal* outX, GMLReal* outY) {
     if (viewsEnabled) {
         repeat(MAX_VIEWS, vi) {
             RuntimeView* v = &runner->views[vi];
-            if (!v->enabled || runner->viewSurfaceIds[vi] != -1) continue;
+            if (!v->enabled || v->surfaceId != -1) continue;
             screenViewCount++;
             lastScreenViewIndex = (int32_t) vi;
             int32_t portX = (int32_t) ((float) v->portX * displayScaleX + 0.5f);

src/runner.h

@@ -140,6 +140,7 @@ typedef struct {
     int32_t portWidth;
     int32_t portHeight;
     int32_t cameraId;
+    int32_t surfaceId;
 } RuntimeView;
 
 typedef struct {
@@ -480,7 +481,6 @@ struct Runner {
     int32_t viewportY;   // Y offset in window (letterboxing)
     int32_t viewportW;   // Scaled game width in window
     int32_t viewportH;   // Scaled game height in window
-    int32_t viewSurfaceIds[8]; // view_surface_id per view, -1 = default (render to screen), else surface index
     struct { char* key; int value; }* disabledObjects; // stb_ds string hashmap, nullptr = no filtering
     struct { int key; Instance* value; }* instancesById;
     bool forceDrawDepth;

src/vm_builtins.c

@@ -798,7 +798,7 @@ RValue VMBuiltins_getVariable(VMContext* ctx, int16_t builtinVarId, const char*
             return RValue_makeReal(0.0);
         }
         case BUILTIN_VAR_VIEW_SURFACE_ID:
-            if (arrayIndex >= 0 && MAX_VIEWS > arrayIndex) return RValue_makeReal((GMLReal) runner->viewSurfaceIds[arrayIndex]);
+            if (arrayIndex >= 0 && MAX_VIEWS > arrayIndex) return RValue_makeReal((GMLReal) runner->views[arrayIndex].surfaceId);
             return RValue_makeReal(-1.0);
 
         // Background properties
@@ -1444,7 +1444,7 @@ void VMBuiltins_setVariable(VMContext* ctx, int16_t builtinVarId, const char* na
             return;
         }
         case BUILTIN_VAR_VIEW_SURFACE_ID:
-            if (arrayIndex >= 0 && MAX_VIEWS > arrayIndex) runner->viewSurfaceIds[arrayIndex] = RValue_toInt32(val);
+            if (arrayIndex >= 0 && MAX_VIEWS > arrayIndex) runner->views[arrayIndex].surfaceId = RValue_toInt32(val);
             return;
 
         // Background properties
@@ -3099,7 +3099,7 @@ static RValue builtin_view_get_surface_id(VMContext* ctx, RValue* args, int32_t
     Runner* runner = ctx->runner;
     int32_t viewIndex = RValue_toInt32(args[0]);
     if (viewIndex >= 0 && MAX_VIEWS > viewIndex) {
-        return RValue_makeReal(runner->viewSurfaceIds[viewIndex]);
+        return RValue_makeReal(runner->views[viewIndex].surfaceId);
     }
     return RValue_makeReal(-1);
 }
@@ -3159,7 +3159,7 @@ static RValue builtin_view_set_surface_id(VMContext* ctx, RValue* args, int32_t
     Runner* runner = ctx->runner;
     int32_t viewIndex = RValue_toInt32(args[0]);
     if (viewIndex >= 0 && MAX_VIEWS > viewIndex) {
-        runner->viewSurfaceIds[viewIndex] = RValue_toInt32(args[1]);
+        runner->views[viewIndex].surfaceId = RValue_toInt32(args[1]);
     }
     return RValue_makeUndefined();
 }