From 6859cbe30856dcbc47a52088dfbc19553440a8f1 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sat, 13 Jun 2020 13:02:56 -0500 Subject: [PATCH 1/2] adress #16 - don't need to swizzle vert colors --- Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp index 6b9ff016f..23c3fe8a9 100644 --- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp +++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp @@ -1242,7 +1242,7 @@ void DiffuseVertColorFeatureGLSL::processVert( Vector< ShaderComponent* >& comp outColor->setStructName( "OUT" ); outColor->setType( "vec4" ); - output = new GenOp( " @ = @.bgra;\r\n", outColor, inColor ); + output = new GenOp( " @ = @;\r\n", outColor, inColor ); } else output = NULL; // Nothing we need to do. From 206d86f1bba20040e41000ab3f2cbc2578305bed Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Fri, 19 Jun 2020 06:48:50 -0500 Subject: [PATCH 2/2] .. we do however appear to need to swizzle DX vert colors... --- Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp index 3159c0ff8..ef16f6492 100644 --- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp +++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp @@ -1252,7 +1252,7 @@ void DiffuseVertColorFeatureHLSL::processVert( Vector< ShaderComponent* >& comp outColor->setStructName( "OUT" ); outColor->setType( "float4" ); - output = new GenOp( " @ = @;\r\n", outColor, inColor ); + output = new GenOp( " @ = @.bgra;\r\n", outColor, inColor ); } else output = NULL; // Nothing we need to do.