projects / platform / core / uifw / OpenUSD.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c950e17)
[usdImagingGL] Minor cleanups to CMake test registration.
authorrajabala <rajabala@users.noreply.github.com>
Wed, 3 Jan 2024 19:50:06 +0000 (11:50 -0800)
committerpixar-oss <pixar-oss@users.noreply.github.com>
Wed, 3 Jan 2024 19:50:06 +0000 (11:50 -0800)
Move tests that depend on build configuration or external libraries after tests that do not.

(Internal change: 2310071)

pxr/usdImaging/usdImagingGL/CMakeLists.txt patch | blob | history

diff --git a/pxr/usdImaging/usdImagingGL/CMakeLists.txt b/pxr/usdImaging/usdImagingGL/CMakeLists.txt
index 67c0aa3a54ba5aa08c882659def2bfc1a27ef368..fb8fd850a0cd8848ebe5d987966ca7125021db3f 100644 (file)
--- a/pxr/usdImaging/usdImagingGL/CMakeLists.txt
+++ b/pxr/usdImaging/usdImagingGL/CMakeLists.txt
@@ -172,7 +172,8 @@ if (NOT BUILD_SHARED_LIBS)
 endif()
 
 #
-# Install all the test data
+# Install tests that don't depend on build configuration or external libraries
+# (such as MaterialX, OpenVDB, PTEX).
 #
 
 pxr_install_test_dir(
@@ -611,7 +612,8 @@ pxr_install_test_dir(
 )
 
 #
-# Register all the tests
+# Register tests that don't depend on build configuration or external libraries
+# (such as MaterialX, OpenVDB, PTEX).
 #
 
 pxr_register_test(testUsdImagingGLBasicDrawing
@@ -2418,7 +2420,8 @@ pxr_register_test(testUsdImagingGLPointInstancer_SceneIndex_pi_masking
         USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
 )
 
-# UsdImagingPiPrototypePropagatingSceneIndex does not implement yet rejecting bad schemas
+# UsdImagingPiPrototypePropagatingSceneIndex does not yet implement
+# rejection of bad schemas.
 #pxr_register_test(testUsdImagingGLPointInstancer_SceneIndex_pi_bad_schema_input
 #    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_bad_schema_input.usda -write pi_bad_schema_input.png"
 #    IMAGE_DIFF_COMPARE
@@ -3602,7 +3605,7 @@ pxr_register_test(testUsdImagingGLShadingPrimvars
 
 # The following tests are disabled since the stages are unable to load any .tx files
 # In theory these image files should be able to load through the hioOiio plugin but I have not
-# been able to get that too work. I did try to convert these images through OIIO's iconvert tool
+# been able to get that to work. I did try to convert these images through OIIO's iconvert tool
 # but it also fails trying to open the .tx files
 #pxr_register_test(testUsdImagingGLTextureWrap
 #    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage textureWrap.usda -write textureWrap.png"
@@ -3915,840 +3918,343 @@ pxr_register_test(testUsdImagingGLMaterialStrengthOrder
         USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
 )
 
-if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
-    pxr_install_test_dir(
-        SRC testenv/testUsdImagingGLMaterialXBasic
-        DEST testUsdImagingGLMaterialXBasic
-    )
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.0075
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLInstancePrimvars
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage test.usda -write testUsdImagingGLInstancePrimvars.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInstancePrimvars.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInstancePrimvars
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.2
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLInstancePrimvars_Filtering
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage testFiltering.usda -write testUsdImagingGLInstancePrimvarsFiltering.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInstancePrimvarsFiltering.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInstancePrimvars
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLInstancePrimvars_Animated
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -times 1 2 3 -stage testAnimated.usda -write testUsdImagingGLInstancePrimvarsAnimated.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInstancePrimvarsAnimated_001.png
+        testUsdImagingGLInstancePrimvarsAnimated_002.png
+        testUsdImagingGLInstancePrimvarsAnimated_003.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInstancePrimvars
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.06
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLSimpleVolumes
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage simpleVolumes.usda -write testUsdImagingGLSimpleVolumes.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.04 -renderSetting volumeRaymarchingStepSizeLighting float 0.05"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLSimpleVolumes.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLSimpleVolumes
+)
 
-    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(testUsdImagingGLSimpleVolumes_Glow
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage simpleVolumeGlow.usda -write testUsdImagingGLSimpleVolumeGlow.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.05 -renderSetting volumeRaymarchingStepSizeLighting float 0.05"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLSimpleVolumeGlow.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLSimpleVolumes
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.0025
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLVolumeMaterial
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage volumeMaterial.usda -write testUsdImagingGLVolumeMaterial.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.05 -renderSetting volumeRaymarchingStepSizeLighting float 0.05"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLVolumeMaterial.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLVolumeMaterial
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.0025
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLBasisCurvesVaryingTopology
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -times 1 3 4 5 4 -stage bunnyCurves.usda -write testUsdImagingGLBasisCurvesVaryingTopology.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLBasisCurvesVaryingTopology_003.png
+        testUsdImagingGLBasisCurvesVaryingTopology_004.png
+        testUsdImagingGLBasisCurvesVaryingTopology_005.png
+    FAIL .05
+    FAIL_PERCENT .03
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLBasisCurvesVaryingTopology
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.0025
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+# Disable this test temporarily due to issue where test runs forever
+pxr_register_test(testUsdImagingGLClippingPlanes
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -camera /World/main_cam -times 1 2 -stage clippingPlanes.usda -write testUsdImagingGLClippingPlanes.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLClippingPlanes_001.png
+        testUsdImagingGLClippingPlanes_002.png
+    FAIL 0.01
+    FAIL_PERCENT 0.02
+    WARN 0.02
+    WARN_PERCENT 0.01
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLClippingPlanes
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.0025
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLAnimatedCamera
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -camera /World/main_cam -times 1 2 3 -stage cameraMoving.usda -write testUsdImagingGLAnimatedCamera.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLAnimatedCamera_001.png
+        testUsdImagingGLAnimatedCamera_002.png
+        testUsdImagingGLAnimatedCamera_003.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLAnimatedCamera
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLAnimatedLights
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -times 1 2 3 -stage lightMoving.usda -write testUsdImagingGLAnimatedLights.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLAnimatedLights_001.png
+        testUsdImagingGLAnimatedLights_002.png
+        testUsdImagingGLAnimatedLights_003.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLAnimatedLights
+)
 
-    pxr_register_test(testUsdImagingGLMaterialXBasic_mxColorspaces
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxColorspaces.usda -write mxColorspaces.png"
-        IMAGE_DIFF_COMPARE
-            mxColorspaces.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
+pxr_register_test(testUsdImagingGLSdr_1
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage object.usda -write testUsdImagingGLSdr1.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLSdr1.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLSdr
+)
 
-    pxr_register_test(testUsdImagingGLMaterialXBasic_normalMap
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxNormalMap.usda -write mxNormalMap.png"
-        IMAGE_DIFF_COMPARE
-            mxNormalMap.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXBasic
-    )
-    
-    # MaterialX materials using texture, texture coordinates, and geompropvalues.
-    pxr_install_test_dir(
-        SRC testenv/testUsdImagingGLMaterialXTextured
-        DEST testUsdImagingGLMaterialXTextured
-    )
+pxr_register_test(testUsdImagingGLSdr_2
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage usdGlslfxEmbedded.usda -write testUsdImagingGLSdr2.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLSdr2.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLSdr
+)
 
+pxr_register_test(testUsdImagingGLInvalidInfoId
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage invalid_infoid.usda -write testUsdImagingGLInvalidInfoId1.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInvalidInfoId1.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInvalidInfoId
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.05
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXTextured
-    )
+pxr_register_test(testUsdImagingGLInheritedPurpose_none
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_none.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInheritedPurpose_none.png
+    FAIL 1
+    FAIL_PERCENT 2
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInheritedPurpose
+)
 
-    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
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.0025
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXTextured
-    )
 
-    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
-            mxGeomprop.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXTextured
-    )
+pxr_register_test(testUsdImagingGLInheritedPurpose_guides
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_guides.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInheritedPurpose_guides.png
+    FAIL 1
+    FAIL_PERCENT 2
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInheritedPurpose
+)
 
-    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
-            mxTexcoord.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXTextured
-    )
 
-    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
-            mxDefaultTextureVals.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXTextured
-    )
+pxr_register_test(testUsdImagingGLInheritedPurpose_render
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose show -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_render.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInheritedPurpose_render.png
+    FAIL 1
+    FAIL_PERCENT 2
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInheritedPurpose
+)
 
-    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
-            mxFallbackDome.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXTextured
-    )
 
-    pxr_register_test(testUsdImagingGLMaterialXTextured_mxDefaultGemopropVal
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -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(testUsdImagingGLInheritedPurpose_proxy
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_proxy.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInheritedPurpose_proxy.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInheritedPurpose
+)
 
-    pxr_register_test(testUsdImagingGLMaterialXTextured_mxCustomNodeDef
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage mxCustomNodeDef.usda -write mxCustomNodeDef.png"
-        IMAGE_DIFF_COMPARE
-            mxCustomNodeDef.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXTextured
-    )
 
-    pxr_register_test(testUsdImagingGLMaterialXTextured_mxTexColorspaces
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTexColorspaces.usda -write mxTexColorspaces.png"
-        IMAGE_DIFF_COMPARE
-            mxTexColorspaces.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.02
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXTextured
-    )
-    
-# These two tests are to provide direct comparisons between the Native and  
-# MaterialX implementations of PreviewSurface Materials. 
-# The first test is using purely Native PreviewSurface materials. 
-# The second uses identical scenes with equivalent MaterialX PreviewSurface
-# materials. 
-# Native UsdPreviewSurface Materials:
-    # pxr_install_test_dir(
-    #     SRC testenv/testUsdImagingGLMaterialXvsNative
-    #     DEST testUsdImagingGLMaterialXvsNative_native
-    # )
+pxr_register_test(testUsdImagingGLInheritedPurpose_all
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose show -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_all.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInheritedPurpose_all.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInheritedPurpose
+)
 
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeDefault
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeDefault.usda -write default.png"
-    #     IMAGE_DIFF_COMPARE
-    #         default.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.0075
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
+# NOTE: These 3 tests pass if we allow the perceptual test to pass if we bump up
+# the FAIL_PERCENT. From the testSpecs.xml these thresholds are set to 1
+# so there might be some differences between idiff -p vs perceptualdiff
+pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_none
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_none.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInheritedPurpose_none.png
+    FAIL 1
+    FAIL_PERCENT 1.1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInheritedPurpose
+)
 
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeMmetallic
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeMmetallic.usda -write metallic.png"
-    #     IMAGE_DIFF_COMPARE
-    #         metallic.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.6
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
 
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeWorkflow
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeWorkflow.usda -write workflow.png"
-    #     IMAGE_DIFF_COMPARE
-    #         workflow.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.2
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
+pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_guides
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_guides.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInheritedPurpose_guides.png
+    FAIL 1
+    FAIL_PERCENT 1.25
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInheritedPurpose
+)
 
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeOpacity
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeOpacity.usda -write opacity.png"
-    #     IMAGE_DIFF_COMPARE
-    #         opacity.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.2
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
 
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeClearcoat
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage clearcoatNative.usda -write clearcoat.png"
-    #     IMAGE_DIFF_COMPARE
-    #         clearcoat.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.6
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeEmissive
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeEmissive.usda -write emissive.png"
-    #     IMAGE_DIFF_COMPARE
-    #         emissive.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.2
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeNormalMap
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeNormalMap.usda -write normalMapped.png"
-    #     IMAGE_DIFF_COMPARE
-    #         normalMapped.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.2
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-# MaterialX UsdPreviewSurface Materials: 
-    # pxr_install_test_dir(
-    #     SRC testenv/testUsdImagingGLMaterialXvsNative
-    #     DEST testUsdImagingGLMaterialXvsNative_materialX
-    # )
-    
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXdefault
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXdefault.usda -write materialXdefault.png"
-    #     IMAGE_DIFF_COMPARE
-    #         default.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.0075
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXmetallic
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXmetallic.usda -write materialXmetallic.png"
-    #     IMAGE_DIFF_COMPARE
-    #         metallic.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.6
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXworkflow
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXworkflow.usda -write materialXworkflow.png"
-    #     IMAGE_DIFF_COMPARE
-    #         workflow.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.2
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXopacity
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXopacity.usda -write materialXopacity.png"
-    #     IMAGE_DIFF_COMPARE
-    #         opacity.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.2
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXclearcoat
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXclearcoat.usda -write materialXclearcoat.png"
-    #     IMAGE_DIFF_COMPARE
-    #         clearcoat.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.6
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXemissive
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXemissive.usda -write materialXemissive.png"
-    #     IMAGE_DIFF_COMPARE
-    #         emissive.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.2
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXnormalMap
-    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXnormalMap.usda -write materialXnormalMap.png"
-    #     IMAGE_DIFF_COMPARE
-    #         normalMapped.png
-    #     FAIL 0.5
-    #     FAIL_PERCENT 0.005
-    #     WARN 0.05
-    #     WARN_PERCENT 0.2
-    #     EXPECTED_RETURN_CODE 0
-    #     TESTENV testUsdImagingGLMaterialXvsNative
-    # )
-
-    pxr_install_test_dir(
-        SRC testenv/testUsdImagingGLMaterialXCustomNodes
-        DEST testUsdImagingGLMaterialXCustomNodes
-    )
-        
-    pxr_register_test(testUsdImagingGLMaterialXCustomNodes_customTexNode
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage customTexNode.usda -write customTexNode.png"
-        IMAGE_DIFF_COMPARE
-            customTexNode.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.2
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXCustomNodes
-        ENV
-            PXR_MTLX_PLUGIN_SEARCH_PATHS=./customNodeDefs
-    )
-
-    pxr_register_test(testUsdImagingGLMaterialXCustomNodes_customMaterial
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage customMaterial.usda -write customMaterial.png"
-        IMAGE_DIFF_COMPARE
-            customMaterial.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.2
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXCustomNodes
-        ENV
-            PXR_MTLX_PLUGIN_SEARCH_PATHS=./customNodeDefs
-    )
+pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_render
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose show -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_render.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLInheritedPurpose_render.png
+    FAIL 1
+    FAIL_PERCENT 1.85
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLInheritedPurpose
+)
 
-    pxr_register_test(testUsdImagingGLMaterialXCustomNodes_customColor
-        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage customColor.usda -write customColor.png"
-        IMAGE_DIFF_COMPARE
-            customColor.png
-        FAIL 0.5
-        FAIL_PERCENT 0.005
-        WARN 0.05
-        WARN_PERCENT 0.2
-        EXPECTED_RETURN_CODE 0
-        TESTENV testUsdImagingGLMaterialXCustomNodes
-        ENV
-            PXR_MTLX_PLUGIN_SEARCH_PATHS=./customNodeDefs
-    )
-endif()
 
-pxr_register_test(testUsdImagingGLInstancePrimvars
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage test.usda -write testUsdImagingGLInstancePrimvars.png"
+pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_proxy
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_proxy.png"
     IMAGE_DIFF_COMPARE
-        testUsdImagingGLInstancePrimvars.png
+        testUsdImagingGLInheritedPurpose_proxy.png
     FAIL 1
     FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInstancePrimvars
+    TESTENV testUsdImagingGLInheritedPurpose
 )
 
-pxr_register_test(testUsdImagingGLInstancePrimvars_Filtering
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage testFiltering.usda -write testUsdImagingGLInstancePrimvarsFiltering.png"
+
+pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_all
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose show -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_all.png"
     IMAGE_DIFF_COMPARE
-        testUsdImagingGLInstancePrimvarsFiltering.png
+        testUsdImagingGLInheritedPurpose_all.png
     FAIL 1
     FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInstancePrimvars
+    TESTENV testUsdImagingGLInheritedPurpose
 )
 
-pxr_register_test(testUsdImagingGLInstancePrimvars_Animated
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -times 1 2 3 -stage testAnimated.usda -write testUsdImagingGLInstancePrimvarsAnimated.png"
+# Note that in the UsdImagingDelegate, the displayColor authored on a material is stronger than the one authored as primvar on a prim using that material.
+pxr_register_test(testUsdImagingGLInvalidUniversalSurface
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage invalid_universal_surface.usda -write testUsdImagingGLInvalidUniversalSurface.png"
     IMAGE_DIFF_COMPARE
-        testUsdImagingGLInstancePrimvarsAnimated_001.png
-        testUsdImagingGLInstancePrimvarsAnimated_002.png
-        testUsdImagingGLInstancePrimvarsAnimated_003.png
+        testUsdImagingGLInvalidUniversalSurface.png
     FAIL 1
     FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInstancePrimvars
+    TESTENV testUsdImagingGLInvalidUniversalSurface
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=false
 )
 
-pxr_register_test(testUsdImagingGLSimpleVolumes
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage simpleVolumes.usda -write testUsdImagingGLSimpleVolumes.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.04 -renderSetting volumeRaymarchingStepSizeLighting float 0.05"
+# Note that in the stage scene index, the displayColor authored on a material is ignored if there is a displayColor primvar authored on the prim using that material.
+pxr_register_test(testUsdImagingGLInvalidUniversalSurface_SceneIndex
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage invalid_universal_surface.usda -write testUsdImagingGLInvalidUniversalSurface_SceneIndex.png"
     IMAGE_DIFF_COMPARE
-        testUsdImagingGLSimpleVolumes.png
+        testUsdImagingGLInvalidUniversalSurface_SceneIndex.png
     FAIL 1
     FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLSimpleVolumes
+    TESTENV testUsdImagingGLInvalidUniversalSurface_SceneIndex
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
 )
 
-pxr_register_test(testUsdImagingGLSimpleVolumes_Glow
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage simpleVolumeGlow.usda -write testUsdImagingGLSimpleVolumeGlow.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.05 -renderSetting volumeRaymarchingStepSizeLighting float 0.05"
+pxr_register_test(testUsdImagingGLNoFallbacks
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage primitives.usda -write testUsdImagingGLNoFallbacks.png"
     IMAGE_DIFF_COMPARE
-        testUsdImagingGLSimpleVolumeGlow.png
+        testUsdImagingGLNoFallbacks.png
     FAIL 1
     FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLSimpleVolumes
+    TESTENV testUsdImagingGLFallbackPrimTypes
 )
 
-pxr_register_test(testUsdImagingGLVolumeMaterial
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage volumeMaterial.usda -write testUsdImagingGLVolumeMaterial.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.05 -renderSetting volumeRaymarchingStepSizeLighting float 0.05"
+
+pxr_register_test(testUsdImagingGLFallbacks_1
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage fallbacks1.usda -write testUsdImagingGLFallbacks_1.png"
     IMAGE_DIFF_COMPARE
-        testUsdImagingGLVolumeMaterial.png
+        testUsdImagingGLFallbacks_1.png
     FAIL 1
     FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLVolumeMaterial
+    TESTENV testUsdImagingGLFallbackPrimTypes
 )
 
-pxr_register_test(testUsdImagingGLBasisCurvesVaryingTopology
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -times 1 3 4 5 4 -stage bunnyCurves.usda -write testUsdImagingGLBasisCurvesVaryingTopology.png"
+
+pxr_register_test(testUsdImagingGLFallbacks_2
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage fallbacks2.usda -write testUsdImagingGLFallbacks_2.png"
     IMAGE_DIFF_COMPARE
-        testUsdImagingGLBasisCurvesVaryingTopology_003.png
-        testUsdImagingGLBasisCurvesVaryingTopology_004.png
-        testUsdImagingGLBasisCurvesVaryingTopology_005.png
-    FAIL .05
-    FAIL_PERCENT .03
+        testUsdImagingGLFallbacks_2.png
+    FAIL 1
+    FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLBasisCurvesVaryingTopology
-)
-
-# Disable this test temporarily due to issue where test runs forever
-pxr_register_test(testUsdImagingGLClippingPlanes
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -camera /World/main_cam -times 1 2 -stage clippingPlanes.usda -write testUsdImagingGLClippingPlanes.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLClippingPlanes_001.png
-        testUsdImagingGLClippingPlanes_002.png
-    FAIL 0.01
-    FAIL_PERCENT 0.02
-    WARN 0.02
-    WARN_PERCENT 0.01
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLClippingPlanes
-)
-
-pxr_register_test(testUsdImagingGLAnimatedCamera
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -camera /World/main_cam -times 1 2 3 -stage cameraMoving.usda -write testUsdImagingGLAnimatedCamera.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLAnimatedCamera_001.png
-        testUsdImagingGLAnimatedCamera_002.png
-        testUsdImagingGLAnimatedCamera_003.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLAnimatedCamera
-)
-
-pxr_register_test(testUsdImagingGLAnimatedLights
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -times 1 2 3 -stage lightMoving.usda -write testUsdImagingGLAnimatedLights.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLAnimatedLights_001.png
-        testUsdImagingGLAnimatedLights_002.png
-        testUsdImagingGLAnimatedLights_003.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLAnimatedLights
-)
-
-pxr_register_test(testUsdImagingGLSdr_1
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage object.usda -write testUsdImagingGLSdr1.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLSdr1.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLSdr
-)
-
-pxr_register_test(testUsdImagingGLSdr_2
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage usdGlslfxEmbedded.usda -write testUsdImagingGLSdr2.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLSdr2.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLSdr
-)
-
-pxr_register_test(testUsdImagingGLInvalidInfoId
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage invalid_infoid.usda -write testUsdImagingGLInvalidInfoId1.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInvalidInfoId1.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInvalidInfoId
-)
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_none
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_none.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_none.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_guides
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_guides.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_guides.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_render
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose show -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_render.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_render.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_proxy
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_proxy.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_proxy.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_all
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose show -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_all.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_all.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-# NOTE: These 3 tests pass if we allow the perceptual test to pass if we bump up
-# the FAIL_PERCENT. From the testSpecs.xml these thresholds are set to 1
-# so there might be some differences between idiff -p vs perceptualdiff
-pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_none
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_none.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_none.png
-    FAIL 1
-    FAIL_PERCENT 1.1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_guides
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_guides.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_guides.png
-    FAIL 1
-    FAIL_PERCENT 1.25
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_render
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose show -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_render.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_render.png
-    FAIL 1
-    FAIL_PERCENT 1.85
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_proxy
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_proxy.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_proxy.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-
-pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_all
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose show -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_all.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInheritedPurpose_all.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInheritedPurpose
-)
-
-# Note that in the UsdImagingDelegate, the displayColor authored on a material is stronger than the one authored as primvar on a prim using that material.
-pxr_register_test(testUsdImagingGLInvalidUniversalSurface
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage invalid_universal_surface.usda -write testUsdImagingGLInvalidUniversalSurface.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInvalidUniversalSurface.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInvalidUniversalSurface
-    ENV
-        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=false
-)
-
-# Note that in the stage scene index, the displayColor authored on a material is ignored if there is a displayColor primvar authored on the prim using that material.
-pxr_register_test(testUsdImagingGLInvalidUniversalSurface_SceneIndex
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage invalid_universal_surface.usda -write testUsdImagingGLInvalidUniversalSurface_SceneIndex.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLInvalidUniversalSurface_SceneIndex.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLInvalidUniversalSurface_SceneIndex
-    ENV
-        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
-)
-
-pxr_register_test(testUsdImagingGLNoFallbacks
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage primitives.usda -write testUsdImagingGLNoFallbacks.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLNoFallbacks.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLFallbackPrimTypes
-)
-
-
-pxr_register_test(testUsdImagingGLFallbacks_1
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage fallbacks1.usda -write testUsdImagingGLFallbacks_1.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLFallbacks_1.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLFallbackPrimTypes
-)
-
-
-pxr_register_test(testUsdImagingGLFallbacks_2
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage fallbacks2.usda -write testUsdImagingGLFallbacks_2.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLFallbacks_2.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLFallbackPrimTypes
+    TESTENV testUsdImagingGLFallbackPrimTypes
 )
 
 
@@ -4961,106 +4467,609 @@ pxr_register_test(testUsdImagingGLPrimvarRefinement_Adaptive_Low
 )
 
 
-pxr_register_test(testUsdImagingGLPrimvarRefinement_Adaptive_Medium
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLPrimvarRefinement.usda -write testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLPrimvarRefinement
-    ENV
-        HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1
-)
+pxr_register_test(testUsdImagingGLPrimvarRefinement_Adaptive_Medium
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLPrimvarRefinement.usda -write testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLPrimvarRefinement
+    ENV
+        HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1
+)
+
+pxr_register_test(testUsdImagingGLDisplacement_Adaptive_VeryHigh
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.4 -offscreen -lighting -sceneLights -shading wireOnSurface -camera /Camera -stage testUsdImagingGLDisplacement.usda -write testUsdImagingGLDisplacement_Adaptive_VeryHigh.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLDisplacement_Adaptive_VeryHigh.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLDisplacement
+    ENV
+        HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1
+)
+
+pxr_register_test(testUsdImagingGLGeomSubsets_Low
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.0 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Low.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLGeomSubsets_Low.png
+    FAIL 1
+    FAIL_PERCENT 2
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLGeomSubsets
+)
+
+
+pxr_register_test(testUsdImagingGLGeomSubsets_Medium
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Medium.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLGeomSubsets_Medium.png
+    FAIL 1
+    FAIL_PERCENT 2
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLGeomSubsets
+)
+
+pxr_register_test(testUsdImagingGLGeomSubsets_Points
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading points -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Points.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLGeomSubsets_Points.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLGeomSubsets
+)
+
+pxr_register_test(testUsdImagingGLGeomSubsets_Quadrangulated
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Quadrangulated.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLGeomSubsets_Quadrangulated.png
+    FAIL 1
+    FAIL_PERCENT 2
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLGeomSubsets
+    ENV
+        HD_ENABLE_FORCE_QUADRANGULATE=1
+)
+
+
+pxr_register_test(testUsdImagingGLGeomSubsets_QuadrangulatedPoints
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading points -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_QuadrangulatedPoints.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLGeomSubsets_QuadrangulatedPoints.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLGeomSubsets
+    ENV
+        HD_ENABLE_FORCE_QUADRANGULATE=1
+)
+
+pxr_register_test(testUsdImagingGLAovVisualization_Storm_depth
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage viz_aov.usda -rendererAov depth -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLAovVisualization_Storm_depth.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLAovVisualization_Storm_depth.png
+    FAIL 0.05
+    FAIL_PERCENT 0.001
+    WARN 0.025
+    WARN_PERCENT 0.002
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLAovVisualization
+)
+
+#
+# Conditionally install and register MaterialX tests
+#
+if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
+    pxr_install_test_dir(
+        SRC testenv/testUsdImagingGLMaterialXBasic
+        DEST testUsdImagingGLMaterialXBasic
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.0075
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.2
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.06
+        EXPECTED_RETURN_CODE 0
+        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(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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.0025
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.0025
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.0025
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.0025
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    pxr_register_test(testUsdImagingGLMaterialXBasic_mxColorspaces
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxColorspaces.usda -write mxColorspaces.png"
+        IMAGE_DIFF_COMPARE
+            mxColorspaces.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+
+    pxr_register_test(testUsdImagingGLMaterialXBasic_normalMap
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxNormalMap.usda -write mxNormalMap.png"
+        IMAGE_DIFF_COMPARE
+            mxNormalMap.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXBasic
+    )
+    
+    # MaterialX materials using texture, texture coordinates, and geompropvalues.
+    pxr_install_test_dir(
+        SRC testenv/testUsdImagingGLMaterialXTextured
+        DEST testUsdImagingGLMaterialXTextured
+    )
+
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.05
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+
+    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
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.0025
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+
+    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
+            mxGeomprop.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+
+    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
+            mxTexcoord.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+
+    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
+            mxDefaultTextureVals.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+
+    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
+            mxFallbackDome.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxDefaultGemopropVal
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -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(testUsdImagingGLMaterialXTextured_mxCustomNodeDef
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage mxCustomNodeDef.usda -write mxCustomNodeDef.png"
+        IMAGE_DIFF_COMPARE
+            mxCustomNodeDef.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+
+    pxr_register_test(testUsdImagingGLMaterialXTextured_mxTexColorspaces
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTexColorspaces.usda -write mxTexColorspaces.png"
+        IMAGE_DIFF_COMPARE
+            mxTexColorspaces.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.02
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXTextured
+    )
+    
+# These two tests are to provide direct comparisons between the Native and  
+# MaterialX implementations of PreviewSurface Materials. 
+# The first test is using purely Native PreviewSurface materials. 
+# The second uses identical scenes with equivalent MaterialX PreviewSurface
+# materials. 
+# Native UsdPreviewSurface Materials:
+    # pxr_install_test_dir(
+    #     SRC testenv/testUsdImagingGLMaterialXvsNative
+    #     DEST testUsdImagingGLMaterialXvsNative_native
+    # )
+
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeDefault
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeDefault.usda -write default.png"
+    #     IMAGE_DIFF_COMPARE
+    #         default.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.0075
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
+
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeMmetallic
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeMmetallic.usda -write metallic.png"
+    #     IMAGE_DIFF_COMPARE
+    #         metallic.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.6
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
+
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeWorkflow
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeWorkflow.usda -write workflow.png"
+    #     IMAGE_DIFF_COMPARE
+    #         workflow.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.2
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
+
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeOpacity
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeOpacity.usda -write opacity.png"
+    #     IMAGE_DIFF_COMPARE
+    #         opacity.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.2
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
+
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeClearcoat
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage clearcoatNative.usda -write clearcoat.png"
+    #     IMAGE_DIFF_COMPARE
+    #         clearcoat.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.6
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
+
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeEmissive
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeEmissive.usda -write emissive.png"
+    #     IMAGE_DIFF_COMPARE
+    #         emissive.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.2
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
+
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_nativeNormalMap
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage nativeNormalMap.usda -write normalMapped.png"
+    #     IMAGE_DIFF_COMPARE
+    #         normalMapped.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.2
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
 
-pxr_register_test(testUsdImagingGLDisplacement_Adaptive_VeryHigh
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.4 -offscreen -lighting -sceneLights -shading wireOnSurface -camera /Camera -stage testUsdImagingGLDisplacement.usda -write testUsdImagingGLDisplacement_Adaptive_VeryHigh.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLDisplacement_Adaptive_VeryHigh.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLDisplacement
-    ENV
-        HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1
-)
+# MaterialX UsdPreviewSurface Materials: 
+    # pxr_install_test_dir(
+    #     SRC testenv/testUsdImagingGLMaterialXvsNative
+    #     DEST testUsdImagingGLMaterialXvsNative_materialX
+    # )
+    
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXdefault
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXdefault.usda -write materialXdefault.png"
+    #     IMAGE_DIFF_COMPARE
+    #         default.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.0075
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
 
-pxr_register_test(testUsdImagingGLGeomSubsets_Low
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.0 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Low.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLGeomSubsets_Low.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLGeomSubsets
-)
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXmetallic
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXmetallic.usda -write materialXmetallic.png"
+    #     IMAGE_DIFF_COMPARE
+    #         metallic.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.6
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
 
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXworkflow
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXworkflow.usda -write materialXworkflow.png"
+    #     IMAGE_DIFF_COMPARE
+    #         workflow.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.2
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
 
-pxr_register_test(testUsdImagingGLGeomSubsets_Medium
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Medium.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLGeomSubsets_Medium.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLGeomSubsets
-)
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXopacity
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXopacity.usda -write materialXopacity.png"
+    #     IMAGE_DIFF_COMPARE
+    #         opacity.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.2
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
 
-pxr_register_test(testUsdImagingGLGeomSubsets_Points
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading points -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Points.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLGeomSubsets_Points.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLGeomSubsets
-)
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXclearcoat
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXclearcoat.usda -write materialXclearcoat.png"
+    #     IMAGE_DIFF_COMPARE
+    #         clearcoat.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.6
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
 
-pxr_register_test(testUsdImagingGLGeomSubsets_Quadrangulated
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Quadrangulated.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLGeomSubsets_Quadrangulated.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLGeomSubsets
-    ENV
-        HD_ENABLE_FORCE_QUADRANGULATE=1
-)
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXemissive
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXemissive.usda -write materialXemissive.png"
+    #     IMAGE_DIFF_COMPARE
+    #         emissive.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.2
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
 
+    # pxr_register_test(testUsdImagingGLMaterialXvsNative_materialXnormalMap
+    #     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage materialXnormalMap.usda -write materialXnormalMap.png"
+    #     IMAGE_DIFF_COMPARE
+    #         normalMapped.png
+    #     FAIL 0.5
+    #     FAIL_PERCENT 0.005
+    #     WARN 0.05
+    #     WARN_PERCENT 0.2
+    #     EXPECTED_RETURN_CODE 0
+    #     TESTENV testUsdImagingGLMaterialXvsNative
+    # )
 
-pxr_register_test(testUsdImagingGLGeomSubsets_QuadrangulatedPoints
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading points -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_QuadrangulatedPoints.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLGeomSubsets_QuadrangulatedPoints.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLGeomSubsets
-    ENV
-        HD_ENABLE_FORCE_QUADRANGULATE=1
-)
+    pxr_install_test_dir(
+        SRC testenv/testUsdImagingGLMaterialXCustomNodes
+        DEST testUsdImagingGLMaterialXCustomNodes
+    )
+        
+    pxr_register_test(testUsdImagingGLMaterialXCustomNodes_customTexNode
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage customTexNode.usda -write customTexNode.png"
+        IMAGE_DIFF_COMPARE
+            customTexNode.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.2
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXCustomNodes
+        ENV
+            PXR_MTLX_PLUGIN_SEARCH_PATHS=./customNodeDefs
+    )
 
-pxr_register_test(testUsdImagingGLAovVisualization_Storm_depth
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage viz_aov.usda -rendererAov depth -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLAovVisualization_Storm_depth.png"
-    IMAGE_DIFF_COMPARE
-        testUsdImagingGLAovVisualization_Storm_depth.png
-    FAIL 0.05
-    FAIL_PERCENT 0.001
-    WARN 0.025
-    WARN_PERCENT 0.002
-    EXPECTED_RETURN_CODE 0
-    TESTENV testUsdImagingGLAovVisualization
-)
+    pxr_register_test(testUsdImagingGLMaterialXCustomNodes_customMaterial
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage customMaterial.usda -write customMaterial.png"
+        IMAGE_DIFF_COMPARE
+            customMaterial.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.2
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXCustomNodes
+        ENV
+            PXR_MTLX_PLUGIN_SEARCH_PATHS=./customNodeDefs
+    )
+
+    pxr_register_test(testUsdImagingGLMaterialXCustomNodes_customColor
+        COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage customColor.usda -write customColor.png"
+        IMAGE_DIFF_COMPARE
+            customColor.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.2
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdImagingGLMaterialXCustomNodes
+        ENV
+            PXR_MTLX_PLUGIN_SEARCH_PATHS=./customNodeDefs
+    )
+endif() # MaterialX tests
 
-# Register Embree Specific Tests
+#
+# Conditionally install and register Embree tests
+#
 if (EMBREE_FOUND AND ${PXR_BUILD_EMBREE_PLUGIN})
     pxr_install_test_dir(
         SRC testenv/testUsdImagingGLHdEmbree
@@ -5275,9 +5284,11 @@ if (EMBREE_FOUND AND ${PXR_BUILD_EMBREE_PLUGIN})
             HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0
             HDEMBREE_SAMPLES_TO_CONVERGENCE=1
     )
-endif()
+endif() # Embree tests
 
-# Register tests that rely on PTEX
+#
+# Conditionally install and register tests that rely on PTEX.
+#
 if (PTEX_FOUND AND ${PXR_ENABLE_PTEX_SUPPORT})
     pxr_register_test(testUsdImagingGLBasicDrawing_shaders
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -offscreen -stage basicDrawing/shaders.usd -frameAll -write testUsdImagingGLBasicDrawing_shaders.png"
@@ -5602,9 +5613,11 @@ if (PTEX_FOUND AND ${PXR_ENABLE_PTEX_SUPPORT})
         ENV
             HGIGL_ENABLE_BINDLESS_TEXTURE=0
     )
-endif()
+endif() # PTEX tests
 
-# Register OpenVDB Specific Tests
+#
+# Conditionally install and register tests that rely on OpenVDB.
+#
 if (OPENVDB_FOUND AND ${PXR_ENABLE_OPENVDB_SUPPORT})
     pxr_install_test_dir(
         SRC testenv/testUsdImagingGLVdbVolume
Domain: Graphics System / DALi;