callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use GLSL 3.30 shaders

Browse Source 
We currently ask for anything above 3.2 GL contexts, but we're still
using GLSL 1.50 shaders all over the place. If a GL driver supports GL
3.2+ and GLSL 1.50 only then we'd be in trouble, but the chances of that
happening are really small.
This commit is contained in:
Emmanuele Bassi 2019-03-27 15:51:34 +00:00
parent d9a382d689
commit bfcd062e8e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/resources/glsl/gl3-texture-2d.fs.glsl
View File

@ -1,4 +1,4 @@
#version 150 #version 330
in vec2 vUv; in vec2 vUv;
@ -7,5 +7,5 @@ out vec4 vertexColor;
uniform sampler2D map; uniform sampler2D map;
void main() { void main() {
vertexColor = texture2D (map, vUv); vertexColor = texture (map, vUv);
} }

2
gdk/resources/glsl/gl3-texture-2d.vs.glsl
View File

@ -1,4 +1,4 @@
#version 150 #version 330
in vec2 position; in vec2 position;
in vec2 uv; in vec2 uv;

8
tests/gtkgears.c
View File

@ -652,7 +652,7 @@ gtk_gears_render (GtkGLArea *area,
} }
static const char vertex_shader_gl[] = static const char vertex_shader_gl[] =
"#version 150\n" "#version 330\n"
"\n" "\n"
"in vec3 position;\n" "in vec3 position;\n"
"in vec3 normal;\n" "in vec3 normal;\n"
@ -682,13 +682,15 @@ static const char vertex_shader_gl[] =
"}"; "}";
static const char fragment_shader_gl[] = static const char fragment_shader_gl[] =
"#version 150\n" "#version 330\n"
"\n" "\n"
"smooth in vec4 Color;\n" "smooth in vec4 Color;\n"
"\n" "\n"
"out vec4 vertexColor;\n"
"\n"
"void main(void)\n" "void main(void)\n"
"{\n" "{\n"
" gl_FragColor = Color;\n" " vertexColor = Color;\n"
"}"; "}";
static const char vertex_shader_gles[] = static const char vertex_shader_gles[] =