From 6fc10c1ddab6d65b81afc67fa19ced3800fbb1ef Mon Sep 17 00:00:00 2001 From: Ben Doherty Date: Wed, 10 Jul 2019 17:06:28 -0700 Subject: [PATCH] Fix matc bug when compiling for multiple APIs (#1393) --- libs/filamat/src/MaterialBuilder.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/filamat/src/MaterialBuilder.cpp b/libs/filamat/src/MaterialBuilder.cpp index b1a5a4cb2b..b70ea4ad74 100644 --- a/libs/filamat/src/MaterialBuilder.cpp +++ b/libs/filamat/src/MaterialBuilder.cpp @@ -423,13 +423,16 @@ bool MaterialBuilder::runSemanticAnalysis() noexcept { assert(!mCodeGenPermutations.empty()); CodeGenParams params = mCodeGenPermutations[0]; - ShaderModel model = ShaderModel::UNKNOWN; + TargetApi targetApi = params.targetApi; + assertSingleTargetApi(targetApi); + ShaderModel model = static_cast(params.shaderModel); + std::string shaderCode = peek(ShaderType::VERTEX, params, mProperties); - bool result = glslTools.analyzeVertexShader(shaderCode, model, mTargetApi); + bool result = glslTools.analyzeVertexShader(shaderCode, model, targetApi); if (!result) return false; shaderCode = peek(ShaderType::FRAGMENT, params, mProperties); - result = glslTools.analyzeFragmentShader(shaderCode, model, mTargetApi); + result = glslTools.analyzeFragmentShader(shaderCode, model, targetApi); return result; #else return true;