From 85b92a372df5fdf6f3a4b02edcad4f0eba60ae72 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 22 Oct 2018 11:22:59 -0700 Subject: [PATCH] Don't use optimized GLSL on android for now --- libraries/shaders/src/shaders/Shaders.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/shaders/src/shaders/Shaders.cpp b/libraries/shaders/src/shaders/Shaders.cpp index c385fadb37..549bf65f80 100644 --- a/libraries/shaders/src/shaders/Shaders.cpp +++ b/libraries/shaders/src/shaders/Shaders.cpp @@ -224,11 +224,16 @@ String Source::getSource(Dialect dialect, Variant variant) const { } } +#ifdef Q_OS_ANDROID + // SPIRV cross injects "#extension GL_OES_texture_buffer : require" into the GLSL shaders, + // which breaks android rendering + return variantSource.scribe; +#else if (variantSource.glsl.empty()) { return variantSource.scribe; } - return variantSource.glsl; +#endif } const Reflection& Source::getReflection(Dialect dialect, Variant variant) const {