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

am dedcb460: am 6707ea95: Merge "2.0 translator: workaround for nVidia "bug""

Browse Source 
* commit 'dedcb46019fae19d5f81f6924025e5ba54a1ec20':
  2.0 translator: workaround for nVidia "bug"
This commit is contained in:
David Turner
2011-08-03 06:53:55 -07:00
committed by Android Git Automerger
parent 42f7afd1c7 dedcb46019
commit fa00fd7e18
2 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,6 @@
ShaderParser::ShaderParser():ObjectData(SHADER_DATA),
m_type(0),
m_src(NULL),
m_parsedLines(NULL) {};
ShaderParser::ShaderParser(GLenum type):ObjectData(SHADER_DATA),
@@ -15,6 +14,12 @@ void ShaderParser::setSrc(const Version& ver,GLsizei count,const GLchar** string
m_src.append(strings[i]);
}
clearParsedSrc();
if(getenv("NV_WAR"))
{
fprintf(stderr, "Workaround for nVidia's liberal shader compilation - adding #version token to shader\n");
parseGLSLversion();
}
/*
version 1.30.10 is the first version of GLSL Language containing precision qualifiers
if the glsl version is less than 1.30.10 than we will use a shader parser which omits
@@ -31,12 +36,29 @@ void ShaderParser::setSrc(const Version& ver,GLsizei count,const GLchar** string
//XXX: Until proved otherwise, glsl doesn't know/use those precision macros, so we omit then
parseOmitPrecision();
#endif
parseOriginalSrc();
}
const GLchar** ShaderParser::parsedLines() {
m_parsedLines = (GLchar*)m_parsedSrc.c_str();
return const_cast<const GLchar**> (&m_parsedLines);
};
const char* ShaderParser::getOriginalSrc(){
return m_src.c_str();
}
void ShaderParser::parseOriginalSrc() {
m_parsedSrc+=m_src;
}
void ShaderParser::parseGLSLversion() {
//if no version definition is found
if (m_src.find("#version ", 0) == std::string::npos) {
m_parsedSrc += "#version 100\n";
}
}
void ShaderParser::parseOmitPrecision(){
//defines we need to add in order to Omit precisions qualifiers
@@ -47,16 +69,7 @@ void ShaderParser::parseOmitPrecision(){
"#define highp \n"
"#define precision \n"
};
//the lengths of defines we need to add in order to Omit precisions qualifiers
static GLuint definesLength = strlen(defines);
const GLchar* origSrc = m_src.c_str();
unsigned int origLength = strlen(origSrc);
m_parsedLines = new GLchar[origLength + definesLength + 1];
strncpy(m_parsedLines,defines,definesLength);
strcpy(m_parsedLines+definesLength,origSrc);
m_parsedSrc+=defines;
}
void ShaderParser::parseExtendDefaultPrecision(){
@@ -68,21 +81,11 @@ void ShaderParser::parseExtendDefaultPrecision(){
"precision lowp samplerCube;\n"
};
//the length of the precision lines which we need to add to the shader
static GLint extendLength = strlen(extend);
const GLchar* origSrc = m_src.c_str();
unsigned int origLength = strlen(origSrc);
m_parsedLines = new GLchar[origLength + extendLength + 1];
strncpy(m_parsedLines,extend,extendLength);
strcpy(m_parsedLines+extendLength,origSrc);
m_parsedSrc+=extend;
}
void ShaderParser::clearParsedSrc(){
if(m_parsedLines){
delete[] m_parsedLines;
}
m_parsedSrc.clear();
}
GLenum ShaderParser::getType() {

5
tools/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.h
View File

@@ -12,17 +12,20 @@ public:
ShaderParser(GLenum type);
void setSrc(const Version& ver,GLsizei count,const GLchar** strings,const GLint* length);
const char* getOriginalSrc();
const GLchar** parsedLines(){return const_cast<const GLchar**>(&m_parsedLines);};
const GLchar** parsedLines();
GLenum getType();
~ShaderParser();
private:
void parseOriginalSrc();
void parseGLSLversion();
void parseOmitPrecision();
void parseExtendDefaultPrecision();
void clearParsedSrc();
GLenum m_type;
std::string m_src;
std::string m_parsedSrc;
GLchar* m_parsedLines;
};
#endif