fix(gl): handle compute shader version headers

GameDevTecnico · Nov 23, 2024 · daef590 · daef590
1 parent 059cdc2
commit daef590
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/core/samples/gl/compute/main.cpp b/core/samples/gl/compute/main.cpp
@@ -46,8 +46,6 @@ int main()
 
         // FIXME: createShaderStage will inject #version 330 core, so this will fail.
         auto cs = renderDevice.createShaderStage(gl::Stage::Compute, R"glsl(
-            #version 430 core
-
             layout(local_size_x = 16, local_size_y = 16) in;
             layout(binding = 0, rgba32f) uniform image2D tex;
 

diff --git a/core/src/gl/ogl_render_device.cpp b/core/src/gl/ogl_render_device.cpp
@@ -2353,20 +2353,19 @@ ShaderStage OGLRenderDevice::createShaderStage(Stage stage, const char* src)
     }
 
 #ifdef __EMSCRIPTEN__
-#define GLSL_HEADER                                                                                                    \
-    "#version 300 es\n"                                                                                                \
-    "#define ES\n"                                                                                                     \
-    "precision highp float;\n"                                                                                         \
-    "precision highp int;\n"                                                                                           \
-    "precision highp sampler2DArray;\n"
+    const char* header = "#version 300 es\n"
+                         "#define ES\n"
+                         "precision highp float;\n"
+                         "precision highp int;\n"
+                         "precision highp sampler2DArray;\n";
 #else
-#define GLSL_HEADER "#version 330 core\n"
+    const char* header = stage == Stage::Compute ? "#version 430 core" : "#version 330 core\n";
 #endif
 
     // Initialize shader
     GLuint id;
     CHECK_VAL(id, glCreateShader(shaderType));
-    const char* srcs[] = {GLSL_HEADER, src};
+    const char* srcs[] = {header, src};
     CHECK(glShaderSource(id, 2, (const GLchar* const*)srcs, nullptr));
     CHECK(glCompileShader(id));