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

am e1b8d543: Merge "opengles Translator: Omit precision macros from shaders"

Browse Source 
* commit 'e1b8d54368030bdc263226ce106072bbceb80d9e':
  opengles Translator: Omit precision macros from shaders
This commit is contained in:
David Turner
2011-07-06 07:32:02 -07:00
committed by Android Git Automerger
parent b027092440 e1b8d54368
commit 8dbeacf27d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,11 +19,16 @@ void ShaderParser::setSrc(const Version& ver,GLsizei count,const GLchar** string
all precision qualifiers from the shader source , otherwise we will use a shader parser all precision qualifiers from the shader source , otherwise we will use a shader parser
which set the default precisions to be the same as the default precisions of GLSL ES which set the default precisions to be the same as the default precisions of GLSL ES
*/ */
#if 0
if(ver < Version(1,30,10)){ if(ver < Version(1,30,10)){
parseOmitPrecision(); parseOmitPrecision();
} else { } else {
parseExtendDefaultPrecision(); parseExtendDefaultPrecision();
} }
#else
//XXX: Until proved otherwise, glsl doesn't know/use those precision macros, so we omit then
parseOmitPrecision();
#endif
} }
const char* ShaderParser::getOriginalSrc(){ const char* ShaderParser::getOriginalSrc(){

2
tools/emulator/opengl/system/GLESv2_enc/GL2Encoder.cpp
View File

@@ -304,7 +304,7 @@ void GL2Encoder::s_glDrawElements(void *self, GLenum mode, GLsizei count, GLenum
count * glSizeof(type)); count * glSizeof(type));
// XXX - OPTIMIZATION (see the other else branch) should be implemented // XXX - OPTIMIZATION (see the other else branch) should be implemented
if(!has_indirect_arrays) { if(!has_indirect_arrays) {
LOGD("unoptimized drawelements !!!\n"); //LOGD("unoptimized drawelements !!!\n");
} }
} else { } else {
// we are all direct arrays and immidate mode index array - // we are all direct arrays and immidate mode index array -