msvc glsl fixes (preprocessor) (#28)

* msvc glsl fixes (preprocessor) * fix stringification for new shaders and enable emulator for android build script
hunter-packages · Oct 20, 2017 · 4fe42a0 · 4fe42a0
1 parent c68d1cb
commit 4fe42a0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/bin/build-android.sh b/bin/build-android.sh
@@ -12,6 +12,7 @@ ARGS=(
     OGLES_GPGPU_BUILD_TESTS=ON
     OGLES_GPGPU_OPENGL_ES3="${OGLES_GPGPU_OPENGL_ES3}"
     HUNTER_CONFIGURATION_TYPES=${CONFIG}
+    GAUZE_ANDROID_USE_EMULATOR=YES
 )
 
 polly.py --toolchain ${TOOLCHAIN} --verbose --config ${CONFIG} --reconfig --open --test --fwd ${ARGS[@]} --test
diff --git a/ogles_gpgpu/common/proc/rgb2luv.cpp b/ogles_gpgpu/common/proc/rgb2luv.cpp
@@ -11,12 +11,11 @@
 BEGIN_OGLES_GPGPU
 
 // clang-format off
-const char * Rgb2LuvProc::fshaderRgb2LuvSrc = OG_TO_STR
-(
+const char * Rgb2LuvProc::fshaderRgb2LuvSrc = 
 #if defined(OGLES_GPGPU_OPENGLES)
-  precision highp float;
+OG_TO_STR(precision highp float;)
 #endif
-
+OG_TO_STR(
   varying vec2 vTexCoord;
   uniform sampler2D uInputTex;
 

diff --git a/ogles_gpgpu/common/proc/swizzle.cpp b/ogles_gpgpu/common/proc/swizzle.cpp
@@ -11,11 +11,11 @@
 BEGIN_OGLES_GPGPU
 
 // clang-format off
-const char * SwizzleProc::fshaderRGBASrc = OG_TO_STR
-(
+const char * SwizzleProc::fshaderRGBASrc =
 #if defined(OGLES_GPGPU_OPENGLES)
- precision mediump float;
+OG_TO_STR(precision mediump float;)
 #endif
+OG_TO_STR(
  varying vec2 vTexCoord;
  uniform sampler2D uInputTex;
  void main()
@@ -26,11 +26,11 @@ const char * SwizzleProc::fshaderRGBASrc = OG_TO_STR
 // clang-format on
 
 // clang-format off
-const char * SwizzleProc::fshaderBGRASrc = OG_TO_STR
-(
+const char * SwizzleProc::fshaderBGRASrc = 
 #if defined(OGLES_GPGPU_OPENGLES)
- precision mediump float;
+OG_TO_STR(precision mediump float;)
 #endif
+OG_TO_STR(
  varying vec2 vTexCoord;
  uniform sampler2D uInputTex;
  void main()
@@ -41,11 +41,11 @@ const char * SwizzleProc::fshaderBGRASrc = OG_TO_STR
 // clang-format on
 
 // clang-format off
-const char * SwizzleProc::fshaderARGBSrc = OG_TO_STR
-(
+const char * SwizzleProc::fshaderARGBSrc = 
 #if defined(OGLES_GPGPU_OPENGLES)
- precision mediump float;
+OG_TO_STR(precision mediump float;)
 #endif
+OG_TO_STR(
  varying vec2 vTexCoord;
  uniform sampler2D uInputTex;
  void main()
@@ -56,11 +56,11 @@ const char * SwizzleProc::fshaderARGBSrc = OG_TO_STR
 // clang-format on
 
 // clang-format off
-const char * SwizzleProc::fshaderABGRSrc = OG_TO_STR
-(
+const char * SwizzleProc::fshaderABGRSrc = 
 #if defined(OGLES_GPGPU_OPENGLES)
- precision mediump float;
+OG_TO_STR(precision mediump float;)
 #endif
+OG_TO_STR(
  varying vec2 vTexCoord;
  uniform sampler2D uInputTex;
  void main()
@@ -71,11 +71,11 @@ const char * SwizzleProc::fshaderABGRSrc = OG_TO_STR
 // clang-format on
 
 // clang-format off
-const char * SwizzleProc::fshaderGRABSrc = OG_TO_STR
-(
+const char * SwizzleProc::fshaderGRABSrc = 
 #if defined(OGLES_GPGPU_OPENGLES)
- precision mediump float;
+OG_TO_STR(precision mediump float;)
 #endif
+OG_TO_STR(
  varying vec2 vTexCoord;
  uniform sampler2D uInputTex;
  void main()