#5532: Migrating texgen param expressions to use the expression slots

codereader · Mar 14, 2021 · 3e136b9 · 3e136b9
1 parent 9b4e70d
commit 3e136b9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/include/ishaderlayer.h b/include/ishaderlayer.h
@@ -105,6 +105,9 @@ class IShaderLayer
         enum Slot
         {
             AlphaTest = 0,
+            TexGenParam1,
+            TexGenParam2,
+            TexGenParam3,
             NumExpressionSlots
         };
     };
@@ -136,6 +139,9 @@ class IShaderLayer
 	 */
 	virtual void evaluateExpressions(std::size_t time, const IRenderEntity& entity) = 0;
 
+    // Returns the requested expression
+    virtual shaders::IShaderExpression::Ptr getExpression(Expression::Slot slot) = 0;
+
 	/**
 	 * The flags set on this stage.
 	 */

diff --git a/radiantcore/shaders/Doom3ShaderLayer.cpp b/radiantcore/shaders/Doom3ShaderLayer.cpp
@@ -85,7 +85,6 @@ void ExpressionSlots::assign(IShaderLayer::Expression::Slot slot, const IShaderE
     if (!newExpression)
     {
         expressionSlot.expression.reset();
-        expressionSlot.expressionIndex = ExpressionSlot::Unused;
         expressionSlot.registerIndex = defaultRegisterIndex;
         return;
     }

diff --git a/radiantcore/shaders/Doom3ShaderLayer.h b/radiantcore/shaders/Doom3ShaderLayer.h
@@ -21,17 +21,11 @@ struct ExpressionSlot
     // The register holding the evaluated float
     std::size_t registerIndex;
 
-    // The index of this expression in the slots array
-    std::size_t expressionIndex;
-
-    // The expression itself
+    // The expression itself (empty if unused)
     IShaderExpression::Ptr expression;
 
-    static const std::size_t Unused = std::numeric_limits<std::size_t>::max();
-
     ExpressionSlot() :
-        registerIndex(REG_ZERO),
-        expressionIndex(Unused)
+        registerIndex(REG_ZERO)
     {}
 };
 
@@ -252,6 +246,11 @@ class Doom3ShaderLayer :
         }
     }
 
+    shaders::IShaderExpression::Ptr getExpression(Expression::Slot slot) override
+    {
+        return _expressionSlots[slot].expression;
+    }
+
     /**
      * \brief
      * Set the bindable texture object.