Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use color consolidation support for UsdPreviewSurface and UsdPrimvarReader_color #979

Merged
merged 1 commit into from
Dec 14, 2020
Merged

Use color consolidation support for UsdPreviewSurface and UsdPrimvarReader_color #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2ShaderFragments/UsdPreviewSurface.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ limitations under the License.
<!-- UsdPreviewSurface Parameters -->
<float name="clearcoat" ref="usdPreviewSurfaceLighting.clearcoatAmount"/>
<float name="clearcoatRoughness" ref="usdPreviewSurfaceLighting.clearcoatRoughness"/>
<float3 name="diffuseColor" ref="diffuseColorPassThrough.input"/>
<float3 name="diffuseColor" ref="diffuseColorPassThrough.input" flags="multiDraw"/>
<float3 name="emissiveColor" ref="usdPreviewSurfaceCombiner.emissiveColor"/>
<float name="ior" ref="usdPreviewSurfaceLighting.ior"/>
<float name="metallic" ref="usdPreviewSurfaceLighting.metallic"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2ShaderFragments/UsdPrimvarReader_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<![CDATA[VP2 implementation for color/opacity reader]]>
</description>
<properties>
<float4 name="color" semantic="fcolor" flags="varyingInputParam" />
<float4 name="diffuseColor" semantic="fcolor" flags="varyingInputParam,multiDraw" />
</properties>
<outputs>
<float4 name="output" />
Expand Down