Skip to content

fix: GLSL version directive never being applied #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cedrik-fuoco-adsk wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: GLSL version directive never being applied #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67c2055
Fix GLSL version directive never being applied on GL3+\n\n#version 15…
cedrik-fuoco-adsk Apr 9, 2026
f364c08
Merge branch 'main' into fix-glsl-amd
cedrik-fuoco-adsk Apr 10, 2026
016a8f4
Merge branch 'main' into fix-glsl-amd
cedrik-fuoco-adsk Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/lib/graphics/TwkGLF/BasicGLProgram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,32 @@ namespace TwkGLF
}
}

namespace
{
// Returns "#version 150\n" for GL3+, empty string for GL2.
// Must be called after a GL context is current.
const char* basicGLVersionHeader()
{
const char* glVersion = (const char*)glGetString(GL_VERSION);
if (glVersion && glVersion[0] >= '3')
return "#version 150\n";
return "";
}
} // namespace

bool BasicGLProgram::compile()
{
GLuint v, f;
m_programId = glCreateProgram();
v = glCreateShader(GL_VERTEX_SHADER);
f = glCreateShader(GL_FRAGMENT_SHADER);
const char* vcode = m_vertexCode.c_str();
glShaderSource(v, 1, &vcode, NULL);

const char* versionHeader = basicGLVersionHeader();
const char* vsrc[2] = {versionHeader, m_vertexCode.c_str()};
glShaderSource(v, 2, vsrc, NULL);
glCompileShader(v);
const char* fcode = m_fragmentCode.c_str();
glShaderSource(f, 1, &fcode, NULL);
const char* fsrc[2] = {versionHeader, m_fragmentCode.c_str()};
glShaderSource(f, 2, fsrc, NULL);
glCompileShader(f);

GLint status = GL_TRUE;
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/CheckerboardBGFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/CloneFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/CloneVertex.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
#else
#define in attribute
#define out varying
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/CrosshatchBGFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/DefaultFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/DefaultVertex.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
#else
#define in attribute
#endif
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/DirectionPaintFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/DirectionPaintVertex.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
#else
#define in attribute
#define out varying
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/EraseFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/EraseVertex.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
#else
#define in attribute
#define out varying
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/OldReplaceFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/PaintColoredFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/ReplaceColoredVertex.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
#else
#define in attribute
#define out varying
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/ReplaceFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/ReplaceVertex.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
#else
#define in attribute
#define out varying
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/ScaleFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/ScaleVertex.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
#else
#define in attribute
#define out varying
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/SoftCloneFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/SoftDirectionPaintFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/SoftEraseFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/SoftOldReplaceFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/SoftPaintFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/SoftReplaceFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/SoftScaleFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/StereoCheckerFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/StereoScanlineFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/TexRectFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/TextureFrag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
out vec4 FragColor;
#define FRAGCOLOR FragColor
#else
Expand Down
1 change: 0 additions & 1 deletion src/lib/graphics/TwkGLF/glsl/TextureVertex.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// SPDX-License-Identifier: Apache-2.0
//
#if __VERSION__ >= 150
#version 150
#else
#define in attribute
#define out varying
Expand Down
Loading