[Android] Add GLSLES3 to the GLSL version enums. Add in the version a…

…nd precision qualifier to the shader header.
dolphin-emu · May 6, 2013 · cb5b9c0 · cb5b9c0
1 parent 028a1a4
commit cb5b9c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -501,6 +501,7 @@ void ProgramShaderCache::CreateHeader ( void )
 	GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion;
 	snprintf(s_glsl_header, sizeof(s_glsl_header), 
 		"#version %s\n"
+		"%s\n" // default precision
 		"%s\n" // tex_rect
 		"%s\n" // ubo
 
@@ -528,9 +529,10 @@ void ProgramShaderCache::CreateHeader ( void )
 		"%s\n"
 		"#define COLOROUT(name) %s\n"
 
-		, v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
+		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
+		, v==GLSLES3 ? "precision highp float;" : ""
 		, v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
-		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v!=GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
+		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
 		, v==GLSL_120 ? "attribute" : "out"
 		, v==GLSL_120 ? "varying" : "centroid in"

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
@@ -12,7 +12,8 @@ void ClearEFBCache();
 enum GLSL_VERSION {
 	GLSL_120,
 	GLSL_130,
-	GLSL_140 // and above
+	GLSL_140, // and above
+	GLSLES3
 };
 
 // ogl-only config, so not in VideoConfig.h