From 47640420ca4f431180dace9262d40c51bbe3a179 Mon Sep 17 00:00:00 2001 From: Brian Roberts Date: Tue, 21 May 2019 21:29:19 -0500 Subject: [PATCH] mac compilation correction - don't use Class:Class constructors --- Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp index 4e29f64d0..230df5c19 100644 --- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp +++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp @@ -3038,10 +3038,10 @@ void ReflectionProbeFeatGLSL::processPix(Vector& componentList Var* surface = new Var("surface", "Surface"); meta->addStatement(new GenOp(" @ = createForwardSurface(@,@,@,@,@,@,@,@);\r\n\n", new DecOp(surface), diffuseColor, bumpNormal, matinfo, inTex, wsPosition, wsEyePos, wsView, worldToCamera)); - String computeForwardProbes = String::String(" @.rgb += computeForwardProbes(@,@,@,@,@,@,@,@,@,\r\n\t\t"); - computeForwardProbes += String::String("@,@,\r\n\t\t"); - computeForwardProbes += String::String("@, @, \r\n\t\t"); - computeForwardProbes += String::String("@,@).rgb; \r\n"); + String computeForwardProbes = String(" @.rgb += computeForwardProbes(@,@,@,@,@,@,@,@,@,\r\n\t\t"); + computeForwardProbes += String("@,@,\r\n\t\t"); + computeForwardProbes += String("@, @, \r\n\t\t"); + computeForwardProbes += String("@,@).rgb; \r\n"); meta->addStatement(new GenOp(computeForwardProbes.c_str(), albedo, surface, cubeMips, numProbes, worldToObjArray, probeConfigData, inProbePosArray, bbMinArray, bbMaxArray, inRefPosArray, hasSkylight, BRDFTexture, @@ -3080,4 +3080,4 @@ void ReflectionProbeFeatGLSL::setTexData(Material::StageData& stageDat, passData.mSamplerNames[texIndex] = "skylightIrradMap"; passData.mTexType[texIndex++] = Material::SGCube; } -} \ No newline at end of file +}