ShaderUniforms::set Float3/Float3Array/Float3x3/Float3x3Array which…

… also takes `blockTypeName` and `blockInstanceName` Summary: `ShaderUniforms::set Float3/Float3Array/Float3x3/Float3x3Array` which also takes `blockTypeName` and `blockInstanceName` Reviewed By: syeh1 Differential Revision: D50436124 fbshipit-source-id: de652ab8cc7822c68624de3bcea6dcc3692d1e72
facebook · Oct 19, 2023 · 602731a · 602731a
1 parent 9c345eb
commit 602731a
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 0 deletions.
diff --git a/IGLU/simple_renderer/ShaderUniforms.cpp b/IGLU/simple_renderer/ShaderUniforms.cpp
@@ -415,13 +415,37 @@ void ShaderUniforms::setFloat3(const igl::NameHandle& uniformName,
   setUniformBytes(uniformName, &value, sizeof(float[3]), 1, arrayIndex);
 }
 
+void ShaderUniforms::setFloat3(const igl::NameHandle& blockTypeName,
+                               const igl::NameHandle& blockInstanceName,
+                               const igl::NameHandle& memberName,
+                               const iglu::simdtypes::float3& value,
+                               size_t arrayIndex) {
+  setUniformBytes(
+      blockTypeName, blockInstanceName, memberName, &value, sizeof(float[3]), 1, arrayIndex);
+}
+
 void ShaderUniforms::setFloat3Array(const igl::NameHandle& uniformName,
                                     iglu::simdtypes::float3* value,
                                     size_t count,
                                     size_t arrayIndex) {
   setUniformBytes(uniformName, value, sizeof(iglu::simdtypes::float3), count, arrayIndex);
 }
 
+void ShaderUniforms::setFloat3Array(const igl::NameHandle& blockTypeName,
+                                    const igl::NameHandle& blockInstanceName,
+                                    const igl::NameHandle& memberName,
+                                    iglu::simdtypes::float3* value,
+                                    size_t count,
+                                    size_t arrayIndex) {
+  setUniformBytes(blockTypeName,
+                  blockInstanceName,
+                  memberName,
+                  value,
+                  sizeof(iglu::simdtypes::float3),
+                  count,
+                  arrayIndex);
+}
+
 void ShaderUniforms::setFloat4(const igl::NameHandle& uniformName,
                                const iglu::simdtypes::float4& value,
                                size_t arrayIndex) {
@@ -512,13 +536,42 @@ void ShaderUniforms::setFloat3x3(const igl::NameHandle& uniformName,
   setUniformBytes(uniformName, &value, sizeof(iglu::simdtypes::float3x3), 1, arrayIndex);
 }
 
+void ShaderUniforms::setFloat3x3(const igl::NameHandle& blockTypeName,
+                                 const igl::NameHandle& blockInstanceName,
+                                 const igl::NameHandle& memberName,
+                                 const iglu::simdtypes::float3x3& value,
+                                 size_t arrayIndex) {
+  setUniformBytes(blockTypeName,
+                  blockInstanceName,
+                  memberName,
+                  &value,
+                  sizeof(iglu::simdtypes::float3x3),
+                  1,
+                  arrayIndex);
+}
+
 void ShaderUniforms::setFloat3x3Array(const igl::NameHandle& uniformName,
                                       const iglu::simdtypes::float3x3* value,
                                       size_t count,
                                       size_t arrayIndex) {
   setUniformBytes(uniformName, value, sizeof(iglu::simdtypes::float3x3), count, arrayIndex);
 }
 
+void ShaderUniforms::setFloat3x3Array(const igl::NameHandle& blockTypeName,
+                                      const igl::NameHandle& blockInstanceName,
+                                      const igl::NameHandle& memberName,
+                                      const iglu::simdtypes::float3x3* value,
+                                      size_t count,
+                                      size_t arrayIndex) {
+  setUniformBytes(blockTypeName,
+                  blockInstanceName,
+                  memberName,
+                  value,
+                  sizeof(iglu::simdtypes::float3x3),
+                  count,
+                  arrayIndex);
+}
+
 void ShaderUniforms::setFloat4x4(const igl::NameHandle& uniformName,
                                  const iglu::simdtypes::float4x4& value,
                                  size_t arrayIndex) {

diff --git a/IGLU/simple_renderer/ShaderUniforms.h b/IGLU/simple_renderer/ShaderUniforms.h
@@ -83,10 +83,21 @@ class ShaderUniforms final {
   void setFloat3(const igl::NameHandle& uniformName,
                  const iglu::simdtypes::float3& value,
                  size_t arrayIndex = 0);
+  void setFloat3(const igl::NameHandle& blockTypeName,
+                 const igl::NameHandle& blockInstanceName,
+                 const igl::NameHandle& memberName,
+                 const iglu::simdtypes::float3& value,
+                 size_t arrayIndex = 0);
   void setFloat3Array(const igl::NameHandle& uniformName,
                       iglu::simdtypes::float3* value,
                       size_t count = 1,
                       size_t arrayIndex = 0);
+  void setFloat3Array(const igl::NameHandle& blockTypeName,
+                      const igl::NameHandle& blockInstanceName,
+                      const igl::NameHandle& memberName,
+                      iglu::simdtypes::float3* value,
+                      size_t count = 1,
+                      size_t arrayIndex = 0);
 
   void setFloat4(const igl::NameHandle& uniformName,
                  const iglu::simdtypes::float4& value,
@@ -129,10 +140,21 @@ class ShaderUniforms final {
   void setFloat3x3(const igl::NameHandle& uniformName,
                    const iglu::simdtypes::float3x3& value,
                    size_t arrayIndex = 0);
+  void setFloat3x3(const igl::NameHandle& blockTypeName,
+                   const igl::NameHandle& blockInstanceName,
+                   const igl::NameHandle& memberName,
+                   const iglu::simdtypes::float3x3& value,
+                   size_t arrayIndex = 0);
   void setFloat3x3Array(const igl::NameHandle& uniformName,
                         const iglu::simdtypes::float3x3* value,
                         size_t count = 1,
                         size_t arrayIndex = 0);
+  void setFloat3x3Array(const igl::NameHandle& blockTypeName,
+                        const igl::NameHandle& blockInstanceName,
+                        const igl::NameHandle& memberName,
+                        const iglu::simdtypes::float3x3* value,
+                        size_t count = 1,
+                        size_t arrayIndex = 0);
 
   void setFloat4x4(const igl::NameHandle& uniformName,
                    const iglu::simdtypes::float4x4& value,