From 48812f7bf7defc334a9fb2c9503a589a250b5603 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 11 Dec 2012 22:46:02 +0100 Subject: [PATCH] update the rasterfont shader to GLSL3.3 - so OGL 3.3 is needed Signed-off-by: Ryan Houdek --- Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index ba0135146f..6c98824341 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -127,18 +127,22 @@ const u8 rasters[char_count][char_height] = { }; static const char *s_vertex_shader = - "attribute vec2 vertexPosition;\n" - "attribute vec2 texturePosition;\n" - "varying vec2 tpos;\n" + "#version 330 core\n" + "layout(location = 0) in vec2 vertexPosition;\n" + "layout(location = 1) in vec2 texturePosition;\n" + "out vec2 tpos;\n" "void main(void) {\n" " gl_Position = vec4(vertexPosition,0,1);\n" " tpos = texturePosition;\n" "}\n"; static const char *s_fragment_shader = + "#version 330 core\n" + "#extension GL_ARB_texture_rectangle : enable\n" "uniform sampler2DRect textureSampler;\n" "uniform vec4 color;\n" - "varying vec2 tpos;\n" + "in vec2 tpos;\n" + "out vec4 gl_FragColor;\n" "void main(void) {\n" " gl_FragColor = texture2DRect(textureSampler,tpos) * color;\n" "}\n"; @@ -182,8 +186,6 @@ RasterFont::RasterFont() glCompileShader(fragment_shader); glAttachShader(shader_program, vertex_shader); glAttachShader(shader_program, fragment_shader); - glBindAttribLocation(shader_program, 0, "vertexPosition"); - glBindAttribLocation(shader_program, 1, "texturePosition"); glLinkProgram(shader_program); glDeleteShader(vertex_shader); glDeleteShader(fragment_shader);