Re organize the MaterialX usdImagingGL tests

Splitting testUsdImagingGLMaterialX into two tests: - testUsdImagingGLMaterialXBasic - testUsdImagingGLMaterialXTextured Moving the mtlx files and any images used in those mtlx files into a subfolder. Deleting two unused baslines Adding a missing test case to the CMakeLists (Internal change: 2294454)
PixarAnimationStudios · Sep 7, 2023 · 6430162 · 6430162
1 parent 23a9bbb
commit 6430162
Show file tree

Hide file tree

Showing 59 changed files with 88 additions and 69 deletions.
diff --git a/pxr/usdImaging/usdImagingGL/CMakeLists.txt b/pxr/usdImaging/usdImagingGL/CMakeLists.txt
@@ -3629,11 +3629,11 @@ pxr_register_test(testUsdImagingGLMaterialStrengthOrder
 
 if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
     pxr_install_test_dir(
-        SRC testenv/testUsdImagingGLMaterialX
-        DEST testUsdImagingGLMaterialX
+        SRC testenv/testUsdImagingGLMaterialXBasic
+        DEST testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxSimple
+    pxr_register_test(testUsdImagingGLMaterialXBasic_mxSimple
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxSimple.usda -write mxSimple.png"
         IMAGE_DIFF_COMPARE
             mxSimple.png
@@ -3642,10 +3642,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.0075
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_standardSurface
+    pxr_register_test(testUsdImagingGLMaterialXBasic_standardSurface
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage standardSurface.usda -write standardSurface.png"
         IMAGE_DIFF_COMPARE
             standardSurface.png
@@ -3654,10 +3654,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.2
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_standardSurfaceMarble
+    pxr_register_test(testUsdImagingGLMaterialXBasic_standardSurfaceMarble
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage standardSurfaceMarble.usda -write standardSurfaceMarble.png"
         IMAGE_DIFF_COMPARE
             standardSurfaceMarble.png
@@ -3666,10 +3666,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.02
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_usdPreviewSurface
+    pxr_register_test(testUsdImagingGLMaterialXBasic_usdPreviewSurface
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage usdPreviewSurface.usda -write usdPreviewSurface.png"
         IMAGE_DIFF_COMPARE
             usdPreviewSurface.png
@@ -3678,10 +3678,22 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.06
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    pxr_register_test(testUsdImagingGLMaterialXBasic_mxGlass
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxGlass.usda -write mxGlass.png"
+        IMAGE_DIFF_COMPARE
+            mxGlass.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_basicMxYup
+    pxr_register_test(testUsdImagingGLMaterialXBasic_basicMxYup
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -stage basicMxYup.usda -camera /FrontCamera -write basicMxYup.png"
         IMAGE_DIFF_COMPARE
             basicMxYup.png
@@ -3690,10 +3702,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.0025
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_basicMxZup
+    pxr_register_test(testUsdImagingGLMaterialXBasic_basicMxZup
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -stage basicMxZup.usda -camera /FrontCamera -write basicMxZup.png"
         IMAGE_DIFF_COMPARE
             basicMxZup.png
@@ -3702,10 +3714,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.0025
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxDirectLights
+    pxr_register_test(testUsdImagingGLMaterialXBasic_mxDirectLights
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDirectLights.usda -write mxDirectLights.png"
         IMAGE_DIFF_COMPARE
             mxDirectLights.png
@@ -3714,10 +3726,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.0025
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxDirectLightsCameraLight
+    pxr_register_test(testUsdImagingGLMaterialXBasic_mxDirectLightsCameraLight
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -camlight -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDirectLights.usda -write mxDirectLightsCameraLight.png"
         IMAGE_DIFF_COMPARE
             mxDirectLightsCameraLight.png
@@ -3726,22 +3738,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.0025
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
-    )
-
-    pxr_register_test(testUsdImagingGLMaterialX_mxFallbackDome
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxFallbackDome.usda -write mxFallbackDome.png"
-        IMAGE_DIFF_COMPARE
-            mxFallbackDome.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxLights
+    pxr_register_test(testUsdImagingGLMaterialXBasic_mxLights
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxLights.usda -write mxLights.png"
         IMAGE_DIFF_COMPARE
             mxLights.png
@@ -3750,10 +3750,17 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.02
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    # MaterialX materials using texture, texture coordinates, and geompropvalues.
+    pxr_install_test_dir(
+        SRC testenv/testUsdImagingGLMaterialXTextured
+        DEST testUsdImagingGLMaterialXTextured
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxTextured
+
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxTextured
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTextured.usda -write mxTextured.png"
         IMAGE_DIFF_COMPARE
             mxTextured.png
@@ -3762,10 +3769,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.05
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXTextured
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxTextured2
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxTextured2
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTextured2.usda -write mxTextured2.png"
         IMAGE_DIFF_COMPARE
             mxTextured2.png
@@ -3774,55 +3781,67 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         WARN 0.05
         WARN_PERCENT 0.0025
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXTextured
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxGlass
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxGlass.usda -write mxGlass.png"
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxGeomprop
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxGeomprop.usda -write mxGeomprop.png"
         IMAGE_DIFF_COMPARE
-            mxGlass.png
+            mxGeomprop.png
         FAIL 0.5
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXTextured
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxGeomprop
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxGeomprop.usda -write mxGeomprop.png"
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxTexcoord
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTexcoord.usda -write mxTexcoord.png"
         IMAGE_DIFF_COMPARE
-            mxGeomprop.png
+            mxTexcoord.png
         FAIL 0.5
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXTextured
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxTexcoord
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTexcoord.usda -write mxTexcoord.png"
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxDefaultTextureVals
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDefaultTextureVals.usda -write mxDefaultTextureVals.png"
         IMAGE_DIFF_COMPARE
-            mxTexcoord.png
+            mxDefaultTextureVals.png
         FAIL 0.5
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXTextured
     )
 
-    pxr_register_test(testUsdImagingGLMaterialX_mxDefaultTextureVals
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDefaultTextureVals.usda -write mxDefaultTextureVals.png"
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxFallbackDome
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxFallbackDome.usda -write mxFallbackDome.png"
         IMAGE_DIFF_COMPARE
-            mxDefaultTextureVals.png
+            mxFallbackDome.png
         FAIL 0.5
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
         EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialX
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxDefaultGemopropVal
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDefaultGeompropVal.usda -write mxDefaultGeompropVal.png"
+        IMAGE_DIFF_COMPARE
+            mxDefaultGeompropVal.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
     )
 
     pxr_register_test(testUsdImagingGLMaterialX_mxCustomNodeDef

diff --git a/...testenv/testUsdImagingGLMaterialX/baseline/mxPreviewSurfaceVsNative_Default.png b/...testenv/testUsdImagingGLMaterialX/baseline/mxPreviewSurfaceVsNative_Default.png
diff --git a/...GL/testenv/testUsdImagingGLMaterialX/baseline/mxPreviewSurfaceVsNative_Gold.png b/...GL/testenv/testUsdImagingGLMaterialX/baseline/mxPreviewSurfaceVsNative_Gold.png
diff --git a/...estUsdImagingGLMaterialX/StinsonBeach.hdr → ...dImagingGLMaterialXBasic/StinsonBeach.hdr b/...estUsdImagingGLMaterialX/StinsonBeach.hdr → ...dImagingGLMaterialXBasic/StinsonBeach.hdr
diff --git a/...magingGLMaterialX/baseline/basicMxYup.png → ...gGLMaterialXBasic/baseline/basicMxYup.png b/...magingGLMaterialX/baseline/basicMxYup.png → ...gGLMaterialXBasic/baseline/basicMxYup.png
diff --git a/...magingGLMaterialX/baseline/basicMxZup.png → ...gGLMaterialXBasic/baseline/basicMxZup.png b/...magingGLMaterialX/baseline/basicMxZup.png → ...gGLMaterialXBasic/baseline/basicMxZup.png
diff --git a/...ngGLMaterialX/baseline/mxDirectLights.png → ...aterialXBasic/baseline/mxDirectLights.png b/...ngGLMaterialX/baseline/mxDirectLights.png → ...aterialXBasic/baseline/mxDirectLights.png
diff --git a/...lX/baseline/mxDirectLightsCameraLight.png → ...ic/baseline/mxDirectLightsCameraLight.png b/...lX/baseline/mxDirectLightsCameraLight.png → ...ic/baseline/mxDirectLightsCameraLight.png
diff --git a/...sdImagingGLMaterialX/baseline/mxGlass.png → ...gingGLMaterialXBasic/baseline/mxGlass.png b/...sdImagingGLMaterialX/baseline/mxGlass.png → ...gingGLMaterialXBasic/baseline/mxGlass.png
diff --git a/...dImagingGLMaterialX/baseline/mxLights.png → ...ingGLMaterialXBasic/baseline/mxLights.png b/...dImagingGLMaterialX/baseline/mxLights.png → ...ingGLMaterialXBasic/baseline/mxLights.png
diff --git a/...dImagingGLMaterialX/baseline/mxSimple.png → ...ingGLMaterialXBasic/baseline/mxSimple.png b/...dImagingGLMaterialX/baseline/mxSimple.png → ...ingGLMaterialXBasic/baseline/mxSimple.png
diff --git a/...gGLMaterialX/baseline/standardSurface.png → ...terialXBasic/baseline/standardSurface.png b/...gGLMaterialX/baseline/standardSurface.png → ...terialXBasic/baseline/standardSurface.png
diff --git a/...erialX/baseline/standardSurfaceMarble.png → ...XBasic/baseline/standardSurfaceMarble.png b/...erialX/baseline/standardSurfaceMarble.png → ...XBasic/baseline/standardSurfaceMarble.png
diff --git a/...LMaterialX/baseline/usdPreviewSurface.png → ...rialXBasic/baseline/usdPreviewSurface.png b/...LMaterialX/baseline/usdPreviewSurface.png → ...rialXBasic/baseline/usdPreviewSurface.png
diff --git a/...testUsdImagingGLMaterialX/basicMxYup.usda → ...sdImagingGLMaterialXBasic/basicMxYup.usda b/...testUsdImagingGLMaterialX/basicMxYup.usda → ...sdImagingGLMaterialXBasic/basicMxYup.usda
@@ -14,7 +14,7 @@ def Sphere "mxSphere" (
 def Scope "Materials" {
     def "MaterialX" (
         references = [
-            @./standard_surface_nodes.mtlx@</MaterialX>,
+            @./mtlxFiles/standard_surface_nodes.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/...testUsdImagingGLMaterialX/basicMxZup.usda → ...sdImagingGLMaterialXBasic/basicMxZup.usda b/...testUsdImagingGLMaterialX/basicMxZup.usda → ...sdImagingGLMaterialXBasic/basicMxZup.usda
@@ -14,7 +14,7 @@ def Sphere "mxSphere" (
 def Scope "Materials" {
     def "MaterialX" (
         references = [
-            @./standard_surface_nodes.mtlx@</MaterialX>,
+            @./mtlxFiles/standard_surface_nodes.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/...tenv/testUsdImagingGLMaterialX/glass.mtlx → ...gingGLMaterialXBasic/mtlxFiles/glass.mtlx b/...tenv/testUsdImagingGLMaterialX/glass.mtlx → ...gingGLMaterialXBasic/mtlxFiles/glass.mtlx
diff --git a/...GLMaterialX/standard_surface_default.mtlx → ...c/mtlxFiles/standard_surface_default.mtlx b/...GLMaterialX/standard_surface_default.mtlx → ...c/mtlxFiles/standard_surface_default.mtlx
diff --git a/...erialX/standard_surface_marble_nodes.mtlx → ...xFiles/standard_surface_marble_nodes.mtlx b/...erialX/standard_surface_marble_nodes.mtlx → ...xFiles/standard_surface_marble_nodes.mtlx
diff --git a/...ngGLMaterialX/standard_surface_nodes.mtlx → ...sic/mtlxFiles/standard_surface_nodes.mtlx b/...ngGLMaterialX/standard_surface_nodes.mtlx → ...sic/mtlxFiles/standard_surface_nodes.mtlx
diff --git a/...LMaterialX/usd_preview_surface_nodes.mtlx → .../mtlxFiles/usd_preview_surface_nodes.mtlx b/...LMaterialX/usd_preview_surface_nodes.mtlx → .../mtlxFiles/usd_preview_surface_nodes.mtlx
diff --git a/...UsdImagingGLMaterialX/mxDirectLights.usda → ...agingGLMaterialXBasic/mxDirectLights.usda b/...UsdImagingGLMaterialX/mxDirectLights.usda → ...agingGLMaterialXBasic/mxDirectLights.usda
@@ -13,7 +13,7 @@ def Sphere "mxSphere" (
 def Scope "Materials" {
     def "MaterialX" (
         references = [
-            @./standard_surface_default.mtlx@</MaterialX>,
+            @./mtlxFiles/standard_surface_default.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/...nv/testUsdImagingGLMaterialX/mxGlass.usda → ...stUsdImagingGLMaterialXBasic/mxGlass.usda b/...nv/testUsdImagingGLMaterialX/mxGlass.usda → ...stUsdImagingGLMaterialXBasic/mxGlass.usda
@@ -61,7 +61,7 @@ def Sphere "USD_Glass" (
 
 def Scope "MaterialX" (
     references = [
-        @./glass.mtlx@</MaterialX>,
+        @./mtlxFiles/glass.mtlx@</MaterialX>,
     ]
 )
 {

diff --git a/...v/testUsdImagingGLMaterialX/mxLights.usda → ...tUsdImagingGLMaterialXBasic/mxLights.usda b/...v/testUsdImagingGLMaterialX/mxLights.usda → ...tUsdImagingGLMaterialXBasic/mxLights.usda
@@ -25,7 +25,7 @@ def Sphere "UsdSphere" (
 def Scope "Materials" {
     def "MaterialX" (
         references = [
-            @./standard_surface_default.mtlx@</MaterialX>,
+            @./mtlxFiles/standard_surface_default.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/...v/testUsdImagingGLMaterialX/mxSimple.usda → ...tUsdImagingGLMaterialXBasic/mxSimple.usda b/...v/testUsdImagingGLMaterialX/mxSimple.usda → ...tUsdImagingGLMaterialXBasic/mxSimple.usda
@@ -25,7 +25,7 @@ def Sphere "ball2" (
 def Scope "Materials" {
     def "MaterialX" (
         references = [
-            @./standard_surface_default.mtlx@</MaterialX>,
+            @./mtlxFiles/standard_surface_default.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/...sdImagingGLMaterialX/standardSurface.usda → ...gingGLMaterialXBasic/standardSurface.usda b/...sdImagingGLMaterialX/standardSurface.usda → ...gingGLMaterialXBasic/standardSurface.usda
@@ -62,7 +62,7 @@ def Scope "Materials" {
     def "MaterialX" (
         references = [
             # Standard Surface MaterialX Nodes
-            @./standard_surface_nodes.mtlx@</MaterialX>,
+            @./mtlxFiles/standard_surface_nodes.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/...ingGLMaterialX/standardSurfaceMarble.usda → ...MaterialXBasic/standardSurfaceMarble.usda b/...ingGLMaterialX/standardSurfaceMarble.usda → ...MaterialXBasic/standardSurfaceMarble.usda
@@ -33,7 +33,7 @@ def Sphere "ball3" (
 def Scope "Materials" {
     def "MaterialX" (
         references = [
-            @./standard_surface_marble_nodes.mtlx@</MaterialX>,
+            @./mtlxFiles/standard_surface_marble_nodes.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/...ImagingGLMaterialX/usdPreviewSurface.usda → ...ngGLMaterialXBasic/usdPreviewSurface.usda b/...ImagingGLMaterialX/usdPreviewSurface.usda → ...ngGLMaterialXBasic/usdPreviewSurface.usda
@@ -43,7 +43,7 @@ def Scope "Materials" {
     def "MaterialX" (
         references = [
             # USD Preview Surface MaterialX Nodes
-            @./usd_preview_surface_nodes.mtlx@</MaterialX>,
+            @./mtlxFiles/usd_preview_surface_nodes.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXTextured/StinsonBeach.hdr b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXTextured/StinsonBeach.hdr
diff --git a/...gGLMaterialX/baseline/mxCustomNodeDef.png → ...ialXTextured/baseline/mxCustomNodeDef.png b/...gGLMaterialX/baseline/mxCustomNodeDef.png → ...ialXTextured/baseline/mxCustomNodeDef.png
diff --git a/...terialX/baseline/mxDefaultGeompropVal.png → ...extured/baseline/mxDefaultGeompropVal.png b/...terialX/baseline/mxDefaultGeompropVal.png → ...extured/baseline/mxDefaultGeompropVal.png
diff --git a/...terialX/baseline/mxDefaultTextureVals.png → ...extured/baseline/mxDefaultTextureVals.png b/...terialX/baseline/mxDefaultTextureVals.png → ...extured/baseline/mxDefaultTextureVals.png
diff --git a/...ngGLMaterialX/baseline/mxFallbackDome.png → ...rialXTextured/baseline/mxFallbackDome.png b/...ngGLMaterialX/baseline/mxFallbackDome.png → ...rialXTextured/baseline/mxFallbackDome.png
diff --git a/...magingGLMaterialX/baseline/mxGeomprop.png → ...MaterialXTextured/baseline/mxGeomprop.png b/...magingGLMaterialX/baseline/mxGeomprop.png → ...MaterialXTextured/baseline/mxGeomprop.png
diff --git a/...magingGLMaterialX/baseline/mxTexcoord.png → ...MaterialXTextured/baseline/mxTexcoord.png b/...magingGLMaterialX/baseline/mxTexcoord.png → ...MaterialXTextured/baseline/mxTexcoord.png
diff --git a/...magingGLMaterialX/baseline/mxTextured.png → ...MaterialXTextured/baseline/mxTextured.png b/...magingGLMaterialX/baseline/mxTextured.png → ...MaterialXTextured/baseline/mxTextured.png
diff --git a/...agingGLMaterialX/baseline/mxTextured2.png → ...aterialXTextured/baseline/mxTextured2.png b/...agingGLMaterialX/baseline/mxTextured2.png → ...aterialXTextured/baseline/mxTextured2.png
diff --git a/...testUsdImagingGLMaterialX/brass_color.jpg → ...terialXTextured/mtlxFiles/brass_color.jpg b/...testUsdImagingGLMaterialX/brass_color.jpg → ...terialXTextured/mtlxFiles/brass_color.jpg
diff --git a/...UsdImagingGLMaterialX/brass_roughness.jpg → ...alXTextured/mtlxFiles/brass_roughness.jpg b/...UsdImagingGLMaterialX/brass_roughness.jpg → ...alXTextured/mtlxFiles/brass_roughness.jpg
diff --git a/...ngGLMaterialX/customNodeDef_material.mtlx → ...red/mtlxFiles/customNodeDef_material.mtlx b/...ngGLMaterialX/customNodeDef_material.mtlx → ...red/mtlxFiles/customNodeDef_material.mtlx
diff --git a/...ingGLMaterialX/customNodeDef_nodeDef.mtlx → ...ured/mtlxFiles/customNodeDef_nodeDef.mtlx b/...ingGLMaterialX/customNodeDef_nodeDef.mtlx → ...ured/mtlxFiles/customNodeDef_nodeDef.mtlx
diff --git a/...magingGLMaterialX/defaultGeompropVal.mtlx → ...extured/mtlxFiles/defaultGeompropVal.mtlx b/...magingGLMaterialX/defaultGeompropVal.mtlx → ...extured/mtlxFiles/defaultGeompropVal.mtlx
diff --git a/...v/testUsdImagingGLMaterialX/geomprop.mtlx → ...MaterialXTextured/mtlxFiles/geomprop.mtlx b/...v/testUsdImagingGLMaterialX/geomprop.mtlx → ...MaterialXTextured/mtlxFiles/geomprop.mtlx
diff --git a/...estenv/testUsdImagingGLMaterialX/grid.png → ...ingGLMaterialXTextured/mtlxFiles/grid.png b/...estenv/testUsdImagingGLMaterialX/grid.png → ...ingGLMaterialXTextured/mtlxFiles/grid.png
diff --git a/.../testUsdImagingGLMaterialX/testSquare.png → ...aterialXTextured/mtlxFiles/testSquare.png b/.../testUsdImagingGLMaterialX/testSquare.png → ...aterialXTextured/mtlxFiles/testSquare.png
diff --git a/...v/testUsdImagingGLMaterialX/texcoord.mtlx → ...MaterialXTextured/mtlxFiles/texcoord.mtlx b/...v/testUsdImagingGLMaterialX/texcoord.mtlx → ...MaterialXTextured/mtlxFiles/texcoord.mtlx
diff --git a/...estUsdImagingGLMaterialX/textureTest.mtlx → ...erialXTextured/mtlxFiles/textureTest.mtlx b/...estUsdImagingGLMaterialX/textureTest.mtlx → ...erialXTextured/mtlxFiles/textureTest.mtlx
diff --git a/...v/testUsdImagingGLMaterialX/textured.mtlx → ...MaterialXTextured/mtlxFiles/textured.mtlx b/...v/testUsdImagingGLMaterialX/textured.mtlx → ...MaterialXTextured/mtlxFiles/textured.mtlx
diff --git a/.../testUsdImagingGLMaterialX/wood_color.jpg → ...aterialXTextured/mtlxFiles/wood_color.jpg b/.../testUsdImagingGLMaterialX/wood_color.jpg → ...aterialXTextured/mtlxFiles/wood_color.jpg
diff --git a/...tUsdImagingGLMaterialX/wood_roughness.jpg → ...ialXTextured/mtlxFiles/wood_roughness.jpg b/...tUsdImagingGLMaterialX/wood_roughness.jpg → ...ialXTextured/mtlxFiles/wood_roughness.jpg
diff --git a/...sdImagingGLMaterialX/mxCustomNodeDef.usda → ...gGLMaterialXTextured/mxCustomNodeDef.usda b/...sdImagingGLMaterialX/mxCustomNodeDef.usda → ...gGLMaterialXTextured/mxCustomNodeDef.usda
@@ -31,7 +31,7 @@ def "ImageCustomNodeDef" (
 }
 
 def Scope "MaterialX"(
-    references = @./customNodeDef_material.mtlx@</MaterialX>
+    references = @./mtlxFiles/customNodeDef_material.mtlx@</MaterialX>
     )
 {
 }

diff --git a/...gingGLMaterialX/mxDefaultGeompropVal.usda → ...terialXTextured/mxDefaultGeompropVal.usda b/...gingGLMaterialX/mxDefaultGeompropVal.usda → ...terialXTextured/mxDefaultGeompropVal.usda
@@ -40,7 +40,7 @@ def Scope "Materials"
 {
     def Scope "MaterialX" (
         references = [
-            @./defaultGeompropVal.mtlx@</MaterialX>,
+            @./mtlxFiles/defaultGeompropVal.mtlx@</MaterialX>,
         ]
     )
     {

diff --git a/...gingGLMaterialX/mxDefaultTextureVals.usda → ...terialXTextured/mxDefaultTextureVals.usda b/...gingGLMaterialX/mxDefaultTextureVals.usda → ...terialXTextured/mxDefaultTextureVals.usda
@@ -13,7 +13,7 @@ def "TestMaterial" (
 
 def Scope "MaterialX" (
     references = [
-        @./textureTest.mtlx@</MaterialX>,
+        @./mtlxFiles/textureTest.mtlx@</MaterialX>,
     ]
 )
 {

diff --git a/...UsdImagingGLMaterialX/mxFallbackDome.usda → ...ngGLMaterialXTextured/mxFallbackDome.usda b/...UsdImagingGLMaterialX/mxFallbackDome.usda → ...ngGLMaterialXTextured/mxFallbackDome.usda
@@ -13,7 +13,7 @@ def "TestMaterial" (
 
 def Scope "MaterialX" (
     references = [
-        @./textureTest.mtlx@</MaterialX>,
+        @./mtlxFiles/textureTest.mtlx@</MaterialX>,
     ]
 )
 {

diff --git a/...testUsdImagingGLMaterialX/mxGeomprop.usda → ...magingGLMaterialXTextured/mxGeomprop.usda b/...testUsdImagingGLMaterialX/mxGeomprop.usda → ...magingGLMaterialXTextured/mxGeomprop.usda
@@ -5,7 +5,7 @@
 
 def Scope "MaterialX" (
     references = [
- 		@./geomprop.mtlx@</MaterialX>,
+ 		@./mtlxFiles/geomprop.mtlx@</MaterialX>,
  	]
 )
 {

diff --git a/...testUsdImagingGLMaterialX/mxTexcoord.usda → ...magingGLMaterialXTextured/mxTexcoord.usda b/...testUsdImagingGLMaterialX/mxTexcoord.usda → ...magingGLMaterialXTextured/mxTexcoord.usda
@@ -33,7 +33,7 @@ def Scope "Materials" {
 
     def Scope "MaterialX" (
         references = [
-            @./texcoord.mtlx@</MaterialX>,
+            @./mtlxFiles/texcoord.mtlx@</MaterialX>,
         ]
     )
     {