LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "opengles emulator: forced GLSL version to be 120."

Browse Source
This commit is contained in:
David Turner
2011-08-09 08:40:25 -07:00
committed by Android Code Review
parent c7fb2970ef ee2388cb94
commit 283df9c42c
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp
View File

@@ -58,7 +58,8 @@ void ShaderParser::parseGLSLversion() {
// That token should be the first non-comment or blank token // That token should be the first non-comment or blank token
// //
const char *src = m_src.c_str(); const char *src = m_src.c_str();
int glslVersion = 0; const int minGLSLVersion = 120;
int glslVersion = minGLSLVersion;
enum { enum {
PARSE_NONE, PARSE_NONE,
PARSE_IN_C_COMMENT, PARSE_IN_C_COMMENT,
@@ -98,16 +99,8 @@ void ShaderParser::parseGLSLversion() {
// token does not exist in this shader source. // token does not exist in this shader source.
// //
if (!strncmp(c,"#version",8)) { if (!strncmp(c,"#version",8)) {
if (sscanf(c+8,"%d",&glslVersion) != 1) { int ver;
// if (sscanf(c+8,"%d",&ver) == 1) {
// #version found but failed to parse the version value!
// this must be an error, set glslVersion to -1 to flag
// that we do not want to override the version, just let
// the shader compiler handle it.
//
glslVersion = -1;
}
else {
// //
// parsed version string correctly, blank out the // parsed version string correctly, blank out the
// version token from the source, we will add it later at // version token from the source, we will add it later at
@@ -117,6 +110,10 @@ void ShaderParser::parseGLSLversion() {
for (int i=0; i<8; i++,cc++) *cc = ' '; for (int i=0; i<8; i++,cc++) *cc = ' ';
while (*cc < '0' || *cc > '9') { *cc = ' '; cc++; } while (*cc < '0' || *cc > '9') { *cc = ' '; cc++; }
while (*cc >= '0' && *cc <= '9') { *cc = ' '; cc++; } while (*cc >= '0' && *cc <= '9') { *cc = ' '; cc++; }
// Use the version from the source but only if
// it is larger than our minGLSLVersion
if (ver > minGLSLVersion) glslVersion = ver;
} }
} }
@@ -127,16 +124,13 @@ void ShaderParser::parseGLSLversion() {
} }
// //
// if no version token found, check if default glsl version // allow to force GLSL version through environment variable
// has been requested through environment variable.
// //
if (glslVersion == 0) { const char *forceVersion = getenv("GOOGLE_GLES_FORCE_GLSL_VERSION");
const char *defVersion = getenv("GOOGLE_GLES_DEFAULT_GLSL_VERSION"); if (forceVersion) {
if (defVersion) { int ver;
if (sscanf(defVersion,"%d",&glslVersion) != 1) { if (sscanf(forceVersion,"%d",&ver) == 1) {
fprintf(stderr,"Wrong value to GOOGLE_GLES_DEFAULT_GLSL_VERSION, should be an integer\n"); glslVersion = ver;
glslVersion = 0;
}
} }
} }