From 805e623779395d0e258039e6d8ab8f1d065933ab Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 30 Jun 2013 23:57:25 +0200 Subject: [PATCH] Use 3.1 in libretro-test-gl when CORE is used. --- gfx/shader_glsl.c | 2 +- libretro-test-gl/libretro-test.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c index 3d1e2e757e..5a263475f0 100644 --- a/gfx/shader_glsl.c +++ b/gfx/shader_glsl.c @@ -304,7 +304,7 @@ static const char *stock_fragment_core_blend = "in vec4 color;\n" "out vec4 FragColor;\n" "void main() {\n" - " FragColor = color * texture2D(Texture, tex_coord);\n" + " FragColor = color * texture(Texture, tex_coord);\n" "}"; static GLint get_uniform(GLuint prog, const char *base) diff --git a/libretro-test-gl/libretro-test.c b/libretro-test-gl/libretro-test.c index fa80502762..70b736d9a3 100644 --- a/libretro-test-gl/libretro-test.c +++ b/libretro-test-gl/libretro-test.c @@ -141,7 +141,7 @@ static const GLfloat vertex_data[] = { #ifdef CORE static const char *vertex_shader[] = { - "#version 420\n" + "#version 140\n" "uniform mat4 uMVP;", "in vec2 aVertex;", "in vec4 aColor;", @@ -153,7 +153,7 @@ static const char *vertex_shader[] = { }; static const char *fragment_shader[] = { - "#version 420\n" + "#version 140\n" "in vec4 color;", "out vec4 FragColor;\n" "void main() {", @@ -427,8 +427,8 @@ bool retro_load_game(const struct retro_game_info *info) #else #ifdef CORE hw_render.context_type = RETRO_HW_CONTEXT_OPENGL_CORE; - hw_render.version_major = 4; - hw_render.version_minor = 2; + hw_render.version_major = 3; + hw_render.version_minor = 1; #else hw_render.context_type = RETRO_HW_CONTEXT_OPENGL; #endif