piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Add GLSLES3 to the GLSL version enums. Add in the version and precision qualifier to the shader header.

Browse Source
This commit is contained in:
Ryan Houdek
2013-05-05 23:22:21 -05:00
parent 028a1a4971
commit cb5b9c0327
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
View File

@ -501,6 +501,7 @@ void ProgramShaderCache::CreateHeader ( void )
GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion; GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion;
snprintf(s_glsl_header, sizeof(s_glsl_header), snprintf(s_glsl_header, sizeof(s_glsl_header),
"#version %s\n" "#version %s\n"
"%s\n" // default precision
"%s\n" // tex_rect "%s\n" // tex_rect
"%s\n" // ubo "%s\n" // ubo
@ -528,9 +529,10 @@ void ProgramShaderCache::CreateHeader ( void )
"%s\n" "%s\n"
"#define COLOROUT(name) %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" , 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" : "in"
, v==GLSL_120 ? "attribute" : "out" , v==GLSL_120 ? "attribute" : "out"
, v==GLSL_120 ? "varying" : "centroid in" , v==GLSL_120 ? "varying" : "centroid in"

3
Source/Plugins/Plugin_VideoOGL/Src/Render.h
View File

@ -12,7 +12,8 @@ void ClearEFBCache();
enum GLSL_VERSION { enum GLSL_VERSION {
GLSL_120, GLSL_120,
GLSL_130, GLSL_130,
GLSL_140 // and above GLSL_140, // and above
GLSLES3
}; };
// ogl-only config, so not in VideoConfig.h // ogl-only config, so not in VideoConfig.h