From 4d8d4a1f061f40032c7d721bd0618b534b00808d Mon Sep 17 00:00:00 2001
From: Adam Cadamally <adam_cadamally@hotmail.co.uk>
Date: Sun, 27 Mar 2022 19:18:26 +0200
Subject: [PATCH 2/4] Remove gl_FragData

---
 code/handmade_opengl.cpp | 30 ++++++++++++++++--------------
 code/win32_handmade.cpp  |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/code/handmade_opengl.cpp b/code/handmade_opengl.cpp
index 29fbd99..01f4220 100644
--- a/code/handmade_opengl.cpp
+++ b/code/handmade_opengl.cpp
@@ -693,7 +693,7 @@ CompileZBiasProgram(zbias_program *Result, b32x DepthPeel)
 {
     char Defines[1024];
     FormatString(sizeof(Defines), Defines,
-                 "#version 130\n"
+                 "#version 330\n"
                  "#define ShaderSimTexWriteSRGB %d\n"
                  "#define ShaderSimTexReadSRGB %d\n"
                  "#define DepthPeel %d\n",
@@ -858,7 +858,7 @@ CompilePeelComposite(peel_composite_program *Result)
 {
     char Defines[1024];
     FormatString(sizeof(Defines), Defines,
-                 "#version 130\n"
+                 "#version 330\n"
                  "#define ShaderSimTexWriteSRGB %d\n"
                  "#define ShaderSimTexReadSRGB %d\n"
                  "#define DepthPeel %d\n",
@@ -939,7 +939,7 @@ CompileResolveMultisample(resolve_multisample_program *Result)
 {
     char Defines[1024];
     FormatString(sizeof(Defines), Defines,
-                 "#version 150\n"
+                 "#version 330\n"
                  "#define ShaderSimTexWriteSRGB %d\n"
                  "#define ShaderSimTexReadSRGB %d\n"
                  "#define DepthPeel %d\n"
@@ -1069,7 +1069,7 @@ CompileFinalStretch(final_stretch_program *Result)
 {
     char Defines[1024];
     FormatString(sizeof(Defines), Defines,
-                 "#version 130\n"
+                 "#version 330\n"
                  "#define ShaderSimTexWriteSRGB %d\n"
                  "#define ShaderSimTexReadSRGB %d\n",
                  OpenGL.ShaderSimTexWriteSRGB,
@@ -1107,7 +1107,7 @@ CompileFakeSeedLighting(fake_seed_lighting_program *Result)
 {
     char Defines[1024];
     FormatString(sizeof(Defines), Defines,
-                 "#version 150\n");
+                 "#version 330\n");
 
     char *VertexCode = R"FOO(
     // Vertex code
@@ -1121,6 +1121,7 @@ CompileFakeSeedLighting(fake_seed_lighting_program *Result)
     char *FragmentCode = R"FOO(
     // Fragment code
     uniform v3 LightP;
+    layout(location = 0) out v4 FragColour[4];
     void main(void)
     {
     v3 FrontEmit = V3(0, 0, 0);
@@ -1141,10 +1142,10 @@ CompileFakeSeedLighting(fake_seed_lighting_program *Result)
     NP = V3(1, 0, 0);
     }
 
-    gl_FragData[0].rgb = FrontEmit;
-    gl_FragData[1].rgb = BackEmit;
-    gl_FragData[2].rgb = SurfaceColor;
-    gl_FragData[3].rgb = NP;
+    FragColour[0].rgb = FrontEmit;
+    FragColour[1].rgb = BackEmit;
+    FragColour[2].rgb = SurfaceColor;
+    FragColour[3].rgb = NP;
     }
     )FOO";
 
@@ -1157,7 +1158,7 @@ CompileMultiLightUp(multigrid_light_up_program *Result)
 {
     char Defines[1024];
     FormatString(sizeof(Defines), Defines,
-                 "#version 150\n");
+                 "#version 330\n");
 
     char *VertexCode = R"FOO(
     // Vertex code
@@ -1178,6 +1179,7 @@ CompileMultiLightUp(multigrid_light_up_program *Result)
     uniform sampler2D SourceSurfaceColorTex;
     uniform sampler2D SourceNPTex;
     smooth in vec2 FragUV;
+    layout(location = 0) out v4 FragColour[4];
     void main(void)
     {
     v3 SourceFrontEmit = texture(SourceFrontEmitTex, FragUV).rgb;
@@ -1190,10 +1192,10 @@ CompileMultiLightUp(multigrid_light_up_program *Result)
     v3 SurfaceColor = SourceSurfaceColor;
     v3 NP = SourceNP;
 
-    gl_FragData[0].rgb = FrontEmit;
-    gl_FragData[1].rgb = BackEmit;
-    gl_FragData[2].rgb = SurfaceColor;
-    gl_FragData[3].rgb = NP;
+    FragColour[0].rgb = FrontEmit;
+    FragColour[1].rgb = BackEmit;
+    FragColour[2].rgb = SurfaceColor;
+    FragColour[3].rgb = NP;
     }
     )FOO";
 
diff --git a/code/win32_handmade.cpp b/code/win32_handmade.cpp
index 4f0b14f..81c7599 100644
--- a/code/win32_handmade.cpp
+++ b/code/win32_handmade.cpp
@@ -614,7 +614,7 @@ Win32InitDSound(HWND Window, int32 SamplesPerSecond, int32 BufferSize)
 int Win32OpenGLAttribs[] =
 {
     WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-    WGL_CONTEXT_MINOR_VERSION_ARB, 0,
+    WGL_CONTEXT_MINOR_VERSION_ARB, 3,
     WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB
 #if HANDMADE_INTERNAL
     |WGL_CONTEXT_DEBUG_BIT_ARB
-- 
2.32.0.windows.2