Merge pull request #3124 from erikaharrison-adsk/adsk/bugfix/RemoveDu…

…plicate Autodesk: Remove the duplicate code in basisCurves.glslfx (Internal change: 2331837)
PixarAnimationStudios · Jun 28, 2024 · 2e2af7f · 2e2af7f
2 parents 2b3bf68 + 8d3cda3
commit 2e2af7f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/pxr/imaging/hdSt/shaders/basisCurves.glslfx b/pxr/imaging/hdSt/shaders/basisCurves.glslfx
@@ -1186,8 +1186,6 @@ void main(void)
 #ifdef HD_HAS_displayOpacity
     color.a = HdGet_displayOpacity();
 #endif
-    color.rgb = ApplyColorOverrides(color).rgb;
-
     vec3 Peye = inData.Peye.xyz / inData.Peye.w;
 
     // We would like to have a better oriented normal here, however to keep the
@@ -1196,9 +1194,7 @@ void main(void)
 
     vec4 patchCoord = vec4(0);
 
-    color.rgb = mix(color.rgb,
-                    ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord).rgb,
-                    GetLightingBlendAmount());
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
 
 #ifdef HD_MATERIAL_TAG_MASKED   
     if (ShouldDiscardByAlpha(color)) {
@@ -1239,16 +1235,12 @@ void main(void)
 #ifdef HD_HAS_displayOpacity
     color.a = HdGet_displayOpacity();
 #endif
-    color.rgb = ApplyColorOverrides(color).rgb;
-
     vec3 Peye = inData.Peye.xyz / inData.Peye.w;
 
     vec3 Neye = fragmentNormal(Peye, inData.Neye, v);
 
     vec4 patchCoord = vec4(0);
-    color.rgb = mix(color.rgb, 
-                    ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord).rgb,
-                    GetLightingBlendAmount());
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
 
 #ifdef HD_MATERIAL_TAG_MASKED   
     if (ShouldDiscardByAlpha(color)) {

diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_bindless.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_bindless.out
@@ -2664,8 +2664,6 @@ void main(void)
 #ifdef HD_HAS_displayOpacity
     color.a = HdGet_displayOpacity();
 #endif
-    color.rgb = ApplyColorOverrides(color).rgb;
-
     vec3 Peye = inData.Peye.xyz / inData.Peye.w;
 
     // We would like to have a better oriented normal here, however to keep the
@@ -2674,9 +2672,7 @@ void main(void)
 
     vec4 patchCoord = vec4(0);
 
-    color.rgb = mix(color.rgb,
-                    ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord).rgb,
-                    GetLightingBlendAmount());
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
 
 #ifdef HD_MATERIAL_TAG_MASKED
     if (ShouldDiscardByAlpha(color)) {

diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_indirect.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_indirect.out
@@ -2664,8 +2664,6 @@ void main(void)
 #ifdef HD_HAS_displayOpacity
     color.a = HdGet_displayOpacity();
 #endif
-    color.rgb = ApplyColorOverrides(color).rgb;
-
     vec3 Peye = inData.Peye.xyz / inData.Peye.w;
 
     // We would like to have a better oriented normal here, however to keep the
@@ -2674,9 +2672,7 @@ void main(void)
 
     vec4 patchCoord = vec4(0);
 
-    color.rgb = mix(color.rgb,
-                    ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord).rgb,
-                    GetLightingBlendAmount());
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
 
 #ifdef HD_MATERIAL_TAG_MASKED
     if (ShouldDiscardByAlpha(color)) {