mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 3.1 in libretro-test-gl when CORE is used.

Browse Source
This commit is contained in:
Themaister 2013-06-30 23:57:25 +02:00
parent 9ab274a51a
commit 805e623779
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/shader_glsl.c
View File

@ -304,7 +304,7 @@ static const char *stock_fragment_core_blend =
"in vec4 color;\n" "in vec4 color;\n"
"out vec4 FragColor;\n" "out vec4 FragColor;\n"
"void main() {\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) static GLint get_uniform(GLuint prog, const char *base)

8
libretro-test-gl/libretro-test.c
View File

@ -141,7 +141,7 @@ static const GLfloat vertex_data[] = {
#ifdef CORE #ifdef CORE
static const char *vertex_shader[] = { static const char *vertex_shader[] = {
"#version 420\n" "#version 140\n"
"uniform mat4 uMVP;", "uniform mat4 uMVP;",
"in vec2 aVertex;", "in vec2 aVertex;",
"in vec4 aColor;", "in vec4 aColor;",
@ -153,7 +153,7 @@ static const char *vertex_shader[] = {
}; };
static const char *fragment_shader[] = { static const char *fragment_shader[] = {
"#version 420\n" "#version 140\n"
"in vec4 color;", "in vec4 color;",
"out vec4 FragColor;\n" "out vec4 FragColor;\n"
"void main() {", "void main() {",
@ -427,8 +427,8 @@ bool retro_load_game(const struct retro_game_info *info)
#else #else
#ifdef CORE #ifdef CORE
hw_render.context_type = RETRO_HW_CONTEXT_OPENGL_CORE; hw_render.context_type = RETRO_HW_CONTEXT_OPENGL_CORE;
hw_render.version_major = 4; hw_render.version_major = 3;
hw_render.version_minor = 2; hw_render.version_minor = 1;
#else #else
hw_render.context_type = RETRO_HW_CONTEXT_OPENGL; hw_render.context_type = RETRO_HW_CONTEXT_OPENGL;
#endif #endif