-
Notifications
You must be signed in to change notification settings - Fork 202
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #79 from Autodesk/fix-mtoh-crash-and-shader-warnings
Fix mtoh crash and shader warnings
- Loading branch information
Showing
13 changed files
with
140 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 16 additions & 16 deletions
32
...der/vp2ShaderFragments/float4ToFloat4.xml → ...der/vp2ShaderFragments/Float4ToFloat3.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,58 @@ | ||
| <fragment uiName="float4ToFloat4" name="float4ToFloat4" type="plumbing" class="ShadeFragment" version="1.0" feature_level="0"> | ||
| <fragment uiName="Float4ToFloat3" name="Float4ToFloat3" type="plumbing" class="ShadeFragment" version="1.0" feature_level="0"> | ||
| <description> | ||
| Passthrough of a 4D float vector. | ||
| Extracts the XYZ component of a 4D float vector. | ||
| </description> | ||
| <properties> | ||
| <float4 name="input"/> | ||
| </properties> | ||
| <values/> | ||
| <outputs> | ||
| <float4 name="output"/> | ||
| <float3 name="output"/> | ||
| </outputs> | ||
| <implementation> | ||
| <implementation render="OGSRenderer" language="Cg" lang_version="2.1"> | ||
| <function_name val="float4ToFloat4"/> | ||
| <function_name val="Float4ToFloat3"/> | ||
| <source> | ||
| <![CDATA[ | ||
| float4 float4ToFloat4(float4 input) | ||
| float3 Float4ToFloat3(float4 input) | ||
| { | ||
| return input; | ||
| return input.xyz; | ||
| } | ||
| ]]> | ||
| </source> | ||
| </implementation> | ||
| <implementation render="OGSRenderer" language="GLSL" lang_version="3.0"> | ||
| <function_name val="float4ToFloat4"/> | ||
| <function_name val="Float4ToFloat3"/> | ||
| <source> | ||
| <![CDATA[ | ||
| vec4 float4ToFloat4(vec4 input) | ||
| vec3 Float4ToFloat3(vec4 input) | ||
| { | ||
| return input; | ||
| return input.xyz; | ||
| } | ||
| ]]> | ||
| </source> | ||
| </implementation> | ||
| <implementation render="OGSRenderer" language="HLSL" lang_version="11.0"> | ||
| <function_name val="float4ToFloat4"/> | ||
| <function_name val="Float4ToFloat3"/> | ||
| <source> | ||
| <![CDATA[ | ||
| float4 float4ToFloat4(float4 input) | ||
| float3 Float4ToFloat3(float4 input) | ||
| { | ||
| return input; | ||
| return input.xyz; | ||
| } | ||
| ]]> | ||
| </source> | ||
| </implementation> | ||
| <implementation render="OGSRenderer" language="HLSL" lang_version="10.0"> | ||
| <function_name val="float4ToFloat4"/> | ||
| <function_name val="Float4ToFloat3"/> | ||
| <source> | ||
| <![CDATA[ | ||
| float4 float4ToFloat4(float4 input) | ||
| float3 Float4ToFloat3(float4 input) | ||
| { | ||
| return input; | ||
| return input.xyz; | ||
| } | ||
| ]]> | ||
| </source> | ||
| </implementation> | ||
| </implementation> | ||
| </fragment> | ||
| </fragment> |
32 changes: 16 additions & 16 deletions
32
...der/vp2ShaderFragments/float4ToFloat3.xml → ...der/vp2ShaderFragments/Float4ToFloat4.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,58 @@ | ||
| <fragment uiName="float4ToFloat3" name="float4ToFloat3" type="plumbing" class="ShadeFragment" version="1.0" feature_level="0"> | ||
| <fragment uiName="Float4ToFloat4" name="Float4ToFloat4" type="plumbing" class="ShadeFragment" version="1.0" feature_level="0"> | ||
| <description> | ||
| Extracts the XYZ component of a 4D float vector. | ||
| Passthrough of a 4D float vector. | ||
| </description> | ||
| <properties> | ||
| <float4 name="input"/> | ||
| </properties> | ||
| <values/> | ||
| <outputs> | ||
| <float3 name="output"/> | ||
| <float4 name="output"/> | ||
| </outputs> | ||
| <implementation> | ||
| <implementation render="OGSRenderer" language="Cg" lang_version="2.1"> | ||
| <function_name val="float4ToFloat3"/> | ||
| <function_name val="Float4ToFloat4"/> | ||
| <source> | ||
| <![CDATA[ | ||
| float3 float4ToFloat3(float4 input) | ||
| float4 Float4ToFloat4(float4 input) | ||
| { | ||
| return input.xyz; | ||
| return input; | ||
| } | ||
| ]]> | ||
| </source> | ||
| </implementation> | ||
| <implementation render="OGSRenderer" language="GLSL" lang_version="3.0"> | ||
| <function_name val="float4ToFloat3"/> | ||
| <function_name val="Float4ToFloat4"/> | ||
| <source> | ||
| <![CDATA[ | ||
| vec3 float4ToFloat3(vec4 input) | ||
| vec4 Float4ToFloat4(vec4 input) | ||
| { | ||
| return input.xyz; | ||
| return input; | ||
| } | ||
| ]]> | ||
| </source> | ||
| </implementation> | ||
| <implementation render="OGSRenderer" language="HLSL" lang_version="11.0"> | ||
| <function_name val="float4ToFloat3"/> | ||
| <function_name val="Float4ToFloat4"/> | ||
| <source> | ||
| <![CDATA[ | ||
| float3 float4ToFloat3(float4 input) | ||
| float4 Float4ToFloat4(float4 input) | ||
| { | ||
| return input.xyz; | ||
| return input; | ||
| } | ||
| ]]> | ||
| </source> | ||
| </implementation> | ||
| <implementation render="OGSRenderer" language="HLSL" lang_version="10.0"> | ||
| <function_name val="float4ToFloat3"/> | ||
| <function_name val="Float4ToFloat4"/> | ||
| <source> | ||
| <![CDATA[ | ||
| float3 float4ToFloat3(float4 input) | ||
| float4 Float4ToFloat4(float4 input) | ||
| { | ||
| return input.xyz; | ||
| return input; | ||
| } | ||
| ]]> | ||
| </source> | ||
| </implementation> | ||
| </implementation> | ||
| </fragment> | ||
| </fragment> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.