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

* commit '8dbeacf27d691509f103212e32d90301a0c61fda':
  opengles Translator: Omit precision macros from shaders
This commit is contained in:
David Turner
2011-07-06 07:46:09 -07:00
committed by Android Git Automerger
2 changed files with 6 additions and 1 deletions

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
which set the default precisions to be the same as the default precisions of GLSL ES
*/
#if 0
if(ver < Version(1,30,10)){
parseOmitPrecision();
} else {
parseExtendDefaultPrecision();
}
#else
//XXX: Until proved otherwise, glsl doesn't know/use those precision macros, so we omit then
parseOmitPrecision();
#endif
}
const char* ShaderParser::getOriginalSrc(){

View File

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