From ec5bd04378af722654b4ff1a1fd52d60b00384bf Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Wed, 26 Feb 2025 00:21:25 +0100
Subject: [PATCH] [dxvk] Remove uniform data from shaders

No longer used
---
 src/dxvk/dxvk_shader.cpp | 10 +---------
 src/dxvk/dxvk_shader.h   |  6 +-----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/dxvk/dxvk_shader.cpp b/src/dxvk/dxvk_shader.cpp
index bdd375604..558c8d2d3 100644
--- a/src/dxvk/dxvk_shader.cpp
+++ b/src/dxvk/dxvk_shader.cpp
@@ -47,7 +47,6 @@ namespace dxvk {
     const DxvkShaderCreateInfo&   info,
           SpirvCodeBuffer&&       spirv)
   : m_info(info), m_code(spirv), m_bindings(info.stage) {
-    m_info.uniformData = nullptr;
     m_info.bindings = nullptr;
 
     // Copy resource binding slot infos
@@ -66,13 +65,6 @@ namespace dxvk {
       m_bindings.addPushConstantRange(pushConst);
     }
 
-    // Copy uniform buffer data
-    if (info.uniformSize) {
-      m_uniformData.resize(info.uniformSize);
-      std::memcpy(m_uniformData.data(), info.uniformData, info.uniformSize);
-      m_info.uniformData = m_uniformData.data();
-    }
-
     // Run an analysis pass over the SPIR-V code to gather some
     // info that we may need during pipeline compilation.
     bool usesPushConstants = false;
@@ -1503,4 +1495,4 @@ namespace dxvk {
         && features.extShaderModuleIdentifier.shaderModuleIdentifier;
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/dxvk/dxvk_shader.h b/src/dxvk/dxvk_shader.h
index 3d4ad8713..b44979e8f 100644
--- a/src/dxvk/dxvk_shader.h
+++ b/src/dxvk/dxvk_shader.h
@@ -54,9 +54,6 @@ namespace dxvk {
     /// Push constant range
     VkShaderStageFlags pushConstStages = 0;
     uint32_t pushConstSize = 0;
-    /// Uniform buffer data
-    uint32_t uniformSize = 0;
-    const char* uniformData = nullptr;
     /// Rasterized stream, or -1
     int32_t xfbRasterizedStream = 0;
     /// Tess control patch vertex count
@@ -266,7 +263,6 @@ namespace dxvk {
     uint32_t                      m_specConstantMask = 0;
     std::atomic<bool>             m_needsLibraryCompile = { true };
 
-    std::vector<char>             m_uniformData;
     std::vector<BindingOffsets>   m_bindingOffsets;
 
     DxvkBindingLayout             m_bindings;
@@ -589,4 +585,4 @@ namespace dxvk {
 
   };
   
-}
\ No newline at end of file
+}