QCXR

Author: Your Name

build/android/Regal/jni/Android.mk

@@ -15,7 +15,7 @@ endif
 
 # apitrace still needs -DANDROID=1 
 
-regal_cflags := -DANDROID=1 -DREGAL_NO_PNG=1 -DREGAL_CONFIG_FILE=/data/.regal -Werror -Wno-constant-logical-operand
+regal_cflags := -DANDROID=1 -DREGAL_NO_PNG=1 -DREGAL_CONFIG_FILE=/data/.regal -Wno-constant-logical-operand -Wno-register
 
 regal_path   := $(LOCAL_PATH)/../../../..
 
@@ -190,7 +190,7 @@ LOCAL_C_INCLUDES := $(regal_c_includes)
 LOCAL_EXPORT_C_INCLUDES := $(regal_export_c_includes)
 LOCAL_STATIC_LIBRARIES := apitrace zlib snappy
 LOCAL_STATIC_LIBRARIES += glslopt pcre
-LOCAL_LDLIBS := -llog
+LOCAL_LDLIBS := -llog -lEGL -lGLESv2
 LOCAL_EXPORT_LDLIBS := -llog
 LOCAL_ARM_MODE  := arm
 include $(BUILD_SHARED_LIBRARY)

build/android/Regal/jni/Application.mk

@@ -2,8 +2,8 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 
 APP_MODULES := Regal_static Regal
-APP_STL := stlport_static
-APP_PLATFORM := android-9
+APP_STL := c++_shared
+APP_PLATFORM := android-32
 
 ifndef APP_OPTIM
 ifeq ($(NDK_DEBUG),1)

src/regal/RegalEmuInfo.cpp

@@ -137,9 +137,9 @@ EmuInfo::init(const ContextInfo &contextInfo)
 #endif
 
 #ifdef REGAL_GL_VERSION
-  version = REGAL_EQUOTE(REGAL_GL_VERSION);
+  version = "4.6";
 #else
-  version = contextInfo.version;
+  version = "4.6";
 #endif
 
 #ifdef REGAL_GL_EXTENSIONS

src/regal/RegalIff.cpp

@@ -4422,226 +4422,7 @@ void Iff::ShaderSource( RegalContext *ctx, GLuint shader, GLsizei count, const G
   for ( int i = 0; i < count; i++ ) {
     src += length != NULL ? string( srcstr[i], length[i] ) : string( srcstr[i] );
   }
-
-  // comment out version in-place
-  int version = -1;
-  version = remove_version( src );
-
-  // if used, replace ftransform with rgl_ftform
-  bool uses_ftransform = replace_ftransform( src );
-
-  if ( legacy ) {
-   remove_precision( src );
-  }
-
-  // Preamble
-
-  string_list ss;
-  if (gles) {
-    // hack around #version 100 on x86 failing compilation
-    if ( ctx->info->gl_version_major >= 3 ) {
-      ss << "#version 120\n";
-      ss << "#define precision\n";
-    } else {
-#if REGAL_FORCE_DESKTOP_GLSL
-      ss << "#version 140\n";
-#else
-      ss << "#version 100\n";
-#if !REGAL_SYS_EMSCRIPTEN
-      // GAB NOTE Dec 2018: do not use EXT_shadow_samplers on Emscripten/WebGL. This is not a valid WebGL extension, and make shader compilation fail.
-      ss << "#extension GL_EXT_shadow_samplers : enable\n";
-      ss << "#define shadow2D(a,b) vec4(shadow2DEXT(a,b))\n";
-#else
-      // GAB Note Dec: 2019: OES_standard_derivatives is available on all browsers
-      ss << "#extension GL_OES_standard_derivatives : enable\n";
-#endif
-#endif
-    }
-  } else if (legacy) {
-    ss << "#version 120\n";
-    ss << "#define precision\n";
-  } else {
-    if (version > 0) {
-      // We should honor the version in the original shader if we can, but leave out for now.
-      //ss << "#version " << version << "\n";
-      if (shaderTypeMap[ shader ] == GL_VERTEX_SHADER) {
-        ss << "#define in attribute\n";
-        ss << "#define out varying\n";
-      } else {
-        ss << "#define in varying\n";
-      }
-    } else {
-      ss << "#version 140\n";
-    }
-  }
-  if (gles || legacy) {
-    if (shaderTypeMap[ shader ] == GL_VERTEX_SHADER) {
-      ss << "#define in attribute\n";
-      ss << "#define out varying\n";
-    } else {
-      ss << "#define in varying\n";
-    }
-  } else {
-    if ( shaderTypeMap[ shader ] == GL_VERTEX_SHADER ) {
-    } else {
-      ss << "#define gl_FragColor           rglFragColor\n";
-      ss << "out vec4 rglFragColor;\n";
-      ss << "#define texture1D texture\n";
-      ss << "#define texture2D texture\n";
-      ss << "#define textureCube texture\n";
-    }
-  }
-  if ( gles ) {
-    ss << "precision highp float;\n";
-  }
-
-  ss << "#define centroid                              \n";
-  ss << "#define gl_FogFragCoord        rglFogFragCoord\n";
-  if ( shaderTypeMap[ shader ] == GL_VERTEX_SHADER ) {
-    ss << "#define gl_Vertex              rglVertex\n";
-    ss << "#define gl_Color               rglColor\n";
-    ss << "#define gl_Normal              rglNormal\n";
-  } else {
-    ss << "#define gl_Color               rglFrontColor\n";
-  }
-  ss << "#define gl_FrontColor          rglFrontColor\n";
-  if ( shaderTypeMap[ shader ] == GL_VERTEX_SHADER ) {
-    ss << "#define gl_SecondaryColor               rglSecondaryColor\n";
-  } else {
-    ss << "#define gl_SecondaryColor               rglFrontSecondaryColor\n";
-  }
-
-  ss << "#define gl_FrontSecondaryColor rglFrontSecondaryColor\n";
-  ss << "#define gl_ClipVertex          rglClipVertex\n";
-  ss << "#define gl_FragDepth           rglFragDepth\n";
-  if ( gles ) {
-    ss << "#define texture3d              texture2d\n";
-    ss << "#define texture3D(a,b)         texture2D(a,b.xy)\n";
-    ss << "#define sampler3D              sampler2D\n";
-  }
-
-  if ( src.find( "gl_FogFragCoord" ) != string::npos ) {
-    ss << "out float rglFogFragCoord;\n";
-  }
-
-// NOTE: ES 2.0 does not support gl_FragDepth, so we just discard it, for now
-// See: http://www.khronos.org/registry/gles/specs/2.0/GLSL_ES_Specification_1.0.17.pdf
-
-  if ( src.find( "gl_FragDepth" ) != string::npos ) {
-    ss << (shaderTypeMap[shader]==GL_VERTEX_SHADER ? "out" : " ") <<  " float rglFragDepth;\n";
-  }
-
-  if ( uses_ftransform || (src.find( "gl_Vertex" ) != string::npos) ) {
-    if ( shaderTypeMap[ shader ] == GL_VERTEX_SHADER ) {
-      ss << "in vec4 rglVertex;\n";
-    }
-  }
-
-  if ( src.find( "gl_Normal" ) != string::npos ) {
-    if ( shaderTypeMap[ shader ] == GL_VERTEX_SHADER ) {
-      ss << "in vec3 rglNormal;\n";
-    }
-  }
-
-  if ( src.find( "gl_Color" ) != string::npos ) {
-    if ( shaderTypeMap[ shader ] == GL_VERTEX_SHADER ) {
-      ss << "in vec4 rglColor;\n";
-    } else {
-      ss << "in vec4 rglFrontColor;\n";
-    }
-  }
-
-  if ( src.find( "gl_FrontColor" ) != string::npos ) {
-    ss << "out vec4 rglFrontColor;\n";
-  }
-
-// NOTE: gl_SecondaryColor can be a vertex shader output, or a fragment shader input.
-// See: http://www.opengl.org/registry/doc/GLSLangSpec.4.30.7.pdf
-
-  if ( src.find( "gl_SecondaryColor" ) != string::npos ) {
-    if ( shaderTypeMap[ shader ] == GL_VERTEX_SHADER )
-    {
-      ss << "in vec4 rglSecondaryColor;\n";
-    }
-    else
-    {
-      ss << "in vec4 rglFrontSecondaryColor;\n";
-    }
-  }
-
-  if ( src.find( "gl_FrontSecondaryColor" ) != string::npos ) {
-    ss << "out vec4 rglFrontSecondaryColor;\n";
-  }
-  if ( src.find( "gl_ClipVertex" ) != string::npos ) {
-    // should be "out", but temporarily disabled due to register pressure concerns
-    // ss << "out vec4 rglClipVertex;\n";
-    ss << "vec4 rglClipVertex;\n";
-  }
-
-  // the below needs to be automated instead of done ad hoc like this - Cass
-  // and it needs to handle "Inverse", "Transpose", and "InverseTranspose".
-
-  if ( src.find( "gl_NormalMatrix" ) != string::npos ) {
-    ss << "uniform mat3 rglNormalMatrix;\n";
-  }
-
-  if( src.find( "gl_ModelViewMatrix" ) != string::npos || uses_ftransform ) {
-    ss << "uniform mat4 rglModelViewMatrix;\n";
-  }
-
-  if( src.find( "gl_ModelViewMatrixInverseTranspose" ) != string::npos ) {
-    ss << "uniform mat4 rglModelViewMatrixInverseTranspose;\n";
-  }
-
-  if( src.find( "gl_ProjectionMatrix" ) != string::npos || uses_ftransform ) {
-    ss << "uniform mat4 rglProjectionMatrix;\n";
-  }
-
-  if( src.find( "gl_ModelViewProjectionMatrix" ) != string::npos ) {
-    ss << "uniform mat4 rglModelViewProjectionMatrix;\n";
-  }
-
-  const char *nums = "01234567";
-  for( int i = 0; i < 8; i++ ) {
-    if( src.find( string("gl_MultiTexCoord") + string( nums + i, 1 )) != string::npos ) {
-      ss << "#define gl_MultiTexCoord" << i << " rglMultiTexCoord" << i << "\n";
-      ss << "in vec4 rglMultiTexCoord" << i << ";\n";
-    }
-  }
-
-  // GAB Note Jan 2019: take "gl_TexCoord" into consideration
-  // Assume its size is REGAL_EMU_MAX_TEXTURE_UNITS (maybe this could be optimized by analysing max index used in the source shader
-  if ( shaderTypeMap[ shader ] == GL_VERTEX_SHADER ) {
-    ss << "#define gl_TexCoord rglTEXCOORD\n";
-    ss << "out vec4 rglTEXCOORD[" << REGAL_EMU_MAX_TEXTURE_UNITS << "];\n";
-  } else {
-    ss << "#define gl_TexCoord rglTEXCOORD\n";
-    ss << "in vec4 rglTEXCOORD[" << REGAL_EMU_MAX_TEXTURE_UNITS << "];\n";
-  }
-
-  const char * matrixSuffix[] = { "", "Inverse", "Transpose", "InverseTranspose" };
-
-  for( int i = 0; i < 4; i++ ) {
-    ss << "#define gl_ModelViewMatrix" << matrixSuffix[i] << " rglModelViewMatrix" << matrixSuffix[i] << "\n";
-    ss << "#define gl_ProjectionMatrix" << matrixSuffix[i] << " rglProjectionMatrix" << matrixSuffix[i] << "\n";
-    ss << "#define gl_ModelViewProjectionMatrix" << matrixSuffix[i] << " rglModelViewProjectionMatrix" << matrixSuffix[i] << "\n";
-    ss << "#define gl_TextureMatrix0" << matrixSuffix[i] << " rglTextureMatrix0" << matrixSuffix[i] << "\n";
-    ss << "\n";
-  }
-
-  ss << "#define gl_NormalMatrix rglNormalMatrix\n";
-
-
-  ss << "#define gl_Sampler0 rglSampler0\n\n";
-
-  if ( uses_ftransform )
-  {
-    ss << "vec4 rgl_ftform() { return gl_ProjectionMatrix * gl_ModelViewMatrix * rglVertex; }\n\n";
-  }
-
-  string preamble = ss.str();
-  src = preamble + src;
-
+  
   const GLchar * dumb = static_cast<const GLchar *>( src.c_str() );
   const GLchar ** dumber = & dumb;
   ctx->dispatcher.emulation.glShaderSource( shader, 1, dumber, NULL );

src/regal/RegalShader.h

@@ -42,6 +42,20 @@ REGAL_GLOBAL_BEGIN
 #include "RegalEmu.h"
 #include "RegalIff.h"
 
+
+#if REGAL_GLSL_OPTIMIZER
+#include "ast.h"
+#include "glsl_parser_extras.h"
+#include "glsl_parser.h"
+#include "ir_optimization.h"
+#include "ir_print_glsl_visitor.h"
+#include "ir_print_visitor.h"
+#include "loop_analysis.h"
+#include "program.h"
+#include "linker.h"
+#endif // REGAL_GLSL_OPTIMIZER
+
+
 using std::string;
 
 REGAL_GLOBAL_END

src/regal/RegalUtil.h

@@ -432,7 +432,7 @@
 //
 
 #ifndef REGAL_FORCE_CORE_PROFILE
-#define REGAL_FORCE_CORE_PROFILE 0
+#define REGAL_FORCE_CORE_PROFILE 1
 #endif
 
 #ifndef REGAL_FORCE_ES1_PROFILE
@@ -457,12 +457,16 @@
 # if REGAL_SYS_EMSCRIPTEN
 #  define REGAL_GLSL_OPTIMIZER 0
 # else
-#  define REGAL_GLSL_OPTIMIZER 1
+#  define REGAL_GLSL_OPTIMIZER 0
 # endif
 #endif
 
 //
 
+#ifndef REGAL_NAMESPACE
+#define REGAL_NAMESPACE 1
+#endif
+
 #ifndef REGAL_STATIC_ES2
 # if REGAL_SYS_EMSCRIPTEN
 #  define REGAL_STATIC_ES2 1
@@ -815,4 +819,4 @@ template <bool Norm> inline double ToDouble(const unsigned long int v ) {
 
 REGAL_NAMESPACE_END
 
-#endif
+#endif