Unverified Commit 350a7477 authored by twinaphex's avatar twinaphex Committed by GitHub
Browse files

Merge pull request #7633 from alfrix/shaders

Fix shader warnings
parents e99e1c47 3e7328b0
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
"#else\n" \ "#else\n" \
" precision mediump float;\n" \ " precision mediump float;\n" \
"#endif\n" #src "#endif\n" #src
#define GLSL_300(src) "#version 300 es\n" #src
#else #else
#define CG(src) "" #src #define CG(src) "" #src
#define GLSL(src) "" #src #define GLSL(src) "" #src
#define GLSL_300(src) "#version 300 es\n" #src #define GLSL_330(src) "#version 330\n" #src
#define GLSL_330(src) "#version 330 core\n" #src
#endif #endif
#endif #endif
...@@ -344,7 +344,6 @@ static bool gl_glsl_compile_shader(glsl_shader_data_t *glsl, ...@@ -344,7 +344,6 @@ static bool gl_glsl_compile_shader(glsl_shader_data_t *glsl,
} }
#endif #endif
snprintf(version, sizeof(version), "#version %u%s\n", version_no, version_extra); snprintf(version, sizeof(version), "#version %u%s\n", version_no, version_extra);
RARCH_LOG("[GLSL]: Using GLSL version %u%s.\n", version_no, version_extra);
} }
else if (glsl_core) else if (glsl_core)
{ {
...@@ -368,9 +367,14 @@ static bool gl_glsl_compile_shader(glsl_shader_data_t *glsl, ...@@ -368,9 +367,14 @@ static bool gl_glsl_compile_shader(glsl_shader_data_t *glsl,
} }
snprintf(version, sizeof(version), "#version %u\n", version_no); snprintf(version, sizeof(version), "#version %u\n", version_no);
RARCH_LOG("[GLSL]: Using GLSL version %u.\n", version_no); }
else
{
/* Don't leave version empty, prevent the compiler warning */
snprintf(version, sizeof(version), "#version 110\n");
} }
RARCH_LOG("[GLSL]: Using GLSL %s", version);
source[0] = version; source[0] = version;
source[1] = define; source[1] = define;
source[2] = glsl->alias_define; source[2] = glsl->alias_define;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment