Fix shader load problem (PixarAnimationStudios#80)

(cherry picked from commit fb1e43fa2a0c466b199f30a70761276d9f284c09)
autodesk-forks · Jan 17, 2023 · 6f1ea70 · 6f1ea70
1 parent 6e88839
commit 6f1ea70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pxr/imaging/hdSt/CMakeLists.txt b/pxr/imaging/hdSt/CMakeLists.txt
@@ -193,6 +193,7 @@ pxr_library(hdSt
         shaders/renderPassShader.glslfx
         shaders/simpleLightingShader.glslfx
         shaders/terminals.glslfx
+        shaders/text.glslfx
         shaders/visibility.glslfx
         shaders/volume.glslfx
         textures/fallbackBlackDomeLight.png

diff --git a/pxr/imaging/hdSt/simpleTextShaderKey.cpp b/pxr/imaging/hdSt/simpleTextShaderKey.cpp
@@ -43,8 +43,9 @@ HdSt_SimpleTextShaderKey::HdSt_SimpleTextShaderKey()
 {
     primType = HdSt_GeometricShader::PrimitiveType::PRIM_MESH_COARSE_TRIANGLES;
     VS[0] = _tokens->vsTextureText;
+    VS[1] = TfToken();
     FS[0] = _tokens->psTextureText;
-
+    FS[1] = TfToken();
 }
 
 HdSt_SimpleTextShaderKey::~HdSt_SimpleTextShaderKey()

diff --git a/pxr/imaging/hdSt/simpleTextShaderKey.h b/pxr/imaging/hdSt/simpleTextShaderKey.h
@@ -68,8 +68,8 @@ struct HdSt_SimpleTextShaderKey : public HdSt_ShaderKey
 
     HdSt_GeometricShader::PrimitiveType primType;
     TfToken glslfx;
-    TfToken VS[1];
-    TfToken FS[1];
+    TfToken VS[2];
+    TfToken FS[2];
 };