ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update the rasterfont shader to GLSL3.3 - so OGL 3.3 is needed 

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
This commit is contained in:
degasus 2012-12-11 22:46:02 +01:00 committed by Ryan Houdek
parent 1bd21f44b2
commit 48812f7bf7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
View File

@ -127,18 +127,22 @@ const u8 rasters[char_count][char_height] = {
}; };
static const char *s_vertex_shader = static const char *s_vertex_shader =
"attribute vec2 vertexPosition;\n" "#version 330 core\n"
"attribute vec2 texturePosition;\n" "layout(location = 0) in vec2 vertexPosition;\n"
"varying vec2 tpos;\n" "layout(location = 1) in vec2 texturePosition;\n"
"out vec2 tpos;\n"
"void main(void) {\n" "void main(void) {\n"
" gl_Position = vec4(vertexPosition,0,1);\n" " gl_Position = vec4(vertexPosition,0,1);\n"
" tpos = texturePosition;\n" " tpos = texturePosition;\n"
"}\n"; "}\n";
static const char *s_fragment_shader = static const char *s_fragment_shader =
"#version 330 core\n"
"#extension GL_ARB_texture_rectangle : enable\n"
"uniform sampler2DRect textureSampler;\n" "uniform sampler2DRect textureSampler;\n"
"uniform vec4 color;\n" "uniform vec4 color;\n"
"varying vec2 tpos;\n" "in vec2 tpos;\n"
"out vec4 gl_FragColor;\n"
"void main(void) {\n" "void main(void) {\n"
" gl_FragColor = texture2DRect(textureSampler,tpos) * color;\n" " gl_FragColor = texture2DRect(textureSampler,tpos) * color;\n"
"}\n"; "}\n";
@ -182,8 +186,6 @@ RasterFont::RasterFont()
glCompileShader(fragment_shader); glCompileShader(fragment_shader);
glAttachShader(shader_program, vertex_shader); glAttachShader(shader_program, vertex_shader);
glAttachShader(shader_program, fragment_shader); glAttachShader(shader_program, fragment_shader);
glBindAttribLocation(shader_program, 0, "vertexPosition");
glBindAttribLocation(shader_program, 1, "texturePosition");
glLinkProgram(shader_program); glLinkProgram(shader_program);
glDeleteShader(vertex_shader); glDeleteShader(vertex_shader);
glDeleteShader(fragment_shader); glDeleteShader(fragment_shader);