From cb5b9c0327c1223975b2fdae28b0db7ef5a92b77 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 5 May 2013 23:22:21 -0500 Subject: [PATCH] [Android] Add GLSLES3 to the GLSL version enums. Add in the version and precision qualifier to the shader header. --- Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 6 ++++-- Source/Plugins/Plugin_VideoOGL/Src/Render.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index 8689ecbd4e..d24ab5a6a0 100644 --- 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