fix(gl): remove shader version declarations

GameDevTecnico · Jun 14, 2024 · 857eebe · 857eebe
1 parent d1dcc42
commit 857eebe
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 38 deletions.
diff --git a/core/samples/gl/compute/main.cpp b/core/samples/gl/compute/main.cpp
@@ -20,8 +20,6 @@ int main()
 
     {
         auto vs = renderDevice.createShaderStage(gl::Stage::Vertex, R"glsl(
-            #version 330 core
-
             in vec2 position;
             in vec2 uv;
 
@@ -35,8 +33,6 @@ int main()
         )glsl");
 
         auto ps = renderDevice.createShaderStage(gl::Stage::Pixel, R"glsl(
-            #version 330 core
-
             in vec2 fragUV;
             out vec4 color;
 
@@ -48,6 +44,7 @@ int main()
             }
         )glsl");
 
+        // FIXME: createShaderStage will inject #version 330 core, so this will fail.
         auto cs = renderDevice.createShaderStage(gl::Stage::Compute, R"glsl(
             #version 430 core
 

diff --git a/engine/assets/render/bloom.fs b/engine/assets/render/bloom.fs
@@ -1,5 +1,3 @@
-#version 330 core
-
 #define DOWNSCALE_PASS 0
 #define UPSCALE_PASS 1
 #define COMBINE_PASS 2

diff --git a/engine/assets/render/bloom_extract.fs b/engine/assets/render/bloom_extract.fs
@@ -1,5 +1,3 @@
-#version 330 core
-
 uniform sampler2D inputTexture;
 
 uniform vec3 luminance;

diff --git a/engine/assets/render/deferred_shading.fs b/engine/assets/render/deferred_shading.fs
@@ -1,5 +1,3 @@
-#version 330 core
-
 in vec2 fragUv;
 
 uniform sampler2D positionTexture;

diff --git a/engine/assets/render/g_buffer_rasterizer.fs b/engine/assets/render/g_buffer_rasterizer.fs
@@ -1,5 +1,3 @@
-#version 330 core
-
 in vec3 fragPosition;
 in vec3 fragNormal;
 in vec3 fragAlbedo;

diff --git a/engine/assets/render/g_buffer_rasterizer.vs b/engine/assets/render/g_buffer_rasterizer.vs
@@ -1,5 +1,3 @@
-#version 330 core
-
 in uvec3 position;
 in uint normal;
 in uint material;

diff --git a/engine/assets/render/screen_quad.vs b/engine/assets/render/screen_quad.vs
@@ -1,5 +1,3 @@
-#version 330 core
-
 in vec4 position;
 in vec2 uv;
 

diff --git a/engine/assets/render/ssao_base.fs b/engine/assets/render/ssao_base.fs
@@ -1,5 +1,3 @@
-#version 330 core
-
 #define MAX_KERNEL_SIZE 64
 
 in vec2 fragUv;

diff --git a/engine/assets/render/ssao_blur.fs b/engine/assets/render/ssao_blur.fs
@@ -1,5 +1,3 @@
-#version 330 core
-
 in vec2 fragUv;
 
 uniform sampler2D ssaoTexture;

diff --git a/engine/assets/render/tone_mapping.fs b/engine/assets/render/tone_mapping.fs
@@ -1,5 +1,3 @@
-#version 330 core
-
 in vec2 fragUv;
 
 uniform sampler2D hdrTexture;

diff --git a/engine/assets/ui/color_rect.fs b/engine/assets/ui/color_rect.fs
@@ -1,5 +1,3 @@
-#version 330 core
-
 layout(std140) uniform PerElement
 {
     vec2 xRange;

diff --git a/engine/assets/ui/element.vs b/engine/assets/ui/element.vs
@@ -1,5 +1,3 @@
-#version 330 core
-
 in vec3 position;
 
 layout(std140) uniform PerElement

diff --git a/engine/src/gizmos/renderer.cpp b/engine/src/gizmos/renderer.cpp
@@ -15,8 +15,6 @@ CUBOS_REFLECT_IMPL(GizmosRenderer)
 void GizmosRenderer::initDrawPipeline()
 {
     auto vs = renderDevice->createShaderStage(Stage::Vertex, R"(
-            #version 330 core
-
             in vec3 position;
 
             uniform MVP
@@ -31,8 +29,6 @@ void GizmosRenderer::initDrawPipeline()
         )");
 
     auto ps = renderDevice->createShaderStage(Stage::Pixel, R"(
-            #version 330 core
-
             out vec4 color;
             
             uniform vec3 objColor;
@@ -49,8 +45,6 @@ void GizmosRenderer::initDrawPipeline()
 void GizmosRenderer::initIdPipeline()
 {
     auto vs = renderDevice->createShaderStage(Stage::Vertex, R"(
-            #version 330 core
-
             in vec3 position;
 
             uniform MVP
@@ -65,8 +59,6 @@ void GizmosRenderer::initIdPipeline()
         )");
 
     auto ps = renderDevice->createShaderStage(Stage::Pixel, R"(
-            #version 330 core
-
             uniform uint gizmo;
             
             out uvec2 idOutput;

diff --git a/engine/src/imgui/imgui.cpp b/engine/src/imgui/imgui.cpp
@@ -203,8 +203,6 @@ static void createDeviceObjects()
 
     // Setup shader pipeline.
     auto vs = rd.createShaderStage(gl::Stage::Vertex, R"glsl(
-#version 330 core
-
 layout (location = 0) in vec2 position;
 layout (location = 1) in vec2 uv;
 layout (location = 2) in vec4 color;
@@ -225,8 +223,6 @@ void main()
     )glsl");
 
     auto ps = rd.createShaderStage(gl::Stage::Pixel, R"glsl(
-#version 330 core
-
 uniform sampler2D tex;
 
 in vec2 fragUv;