diff --git a/src/d3d9/d3d9_fixed_function.cpp b/src/d3d9/d3d9_fixed_function.cpp index 6ac190b3b..0fc845f75 100644 --- a/src/d3d9/d3d9_fixed_function.cpp +++ b/src/d3d9/d3d9_fixed_function.cpp @@ -5,7 +5,6 @@ #include "d3d9_spec_constants.h" #include "../dxvk/dxvk_hash.h" -#include "../dxvk/dxvk_spec_const.h" #include "../spirv/spirv_module.h" diff --git a/src/dxso/dxso_compiler.cpp b/src/dxso/dxso_compiler.cpp index 69f77e5b0..357eccf74 100644 --- a/src/dxso/dxso_compiler.cpp +++ b/src/dxso/dxso_compiler.cpp @@ -9,8 +9,6 @@ #include "../d3d9/d3d9_fixed_function.h" #include "dxso_util.h" -#include "../dxvk/dxvk_spec_const.h" - #include namespace dxvk { diff --git a/src/dxvk/dxvk_compute.cpp b/src/dxvk/dxvk_compute.cpp index d475ace8a..448408dcb 100644 --- a/src/dxvk/dxvk_compute.cpp +++ b/src/dxvk/dxvk_compute.cpp @@ -6,7 +6,6 @@ #include "dxvk_device.h" #include "dxvk_graphics.h" #include "dxvk_pipemanager.h" -#include "dxvk_spec_const.h" #include "dxvk_state_cache.h" namespace dxvk { diff --git a/src/dxvk/dxvk_graphics.cpp b/src/dxvk/dxvk_graphics.cpp index cd7e8e101..fe653264b 100644 --- a/src/dxvk/dxvk_graphics.cpp +++ b/src/dxvk/dxvk_graphics.cpp @@ -5,7 +5,6 @@ #include "dxvk_device.h" #include "dxvk_graphics.h" #include "dxvk_pipemanager.h" -#include "dxvk_spec_const.h" #include "dxvk_state_cache.h" namespace dxvk { diff --git a/src/dxvk/dxvk_spec_const.cpp b/src/dxvk/dxvk_spec_const.cpp deleted file mode 100644 index eec6d8ae5..000000000 --- a/src/dxvk/dxvk_spec_const.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include "dxvk_spec_const.h" - -namespace dxvk { - - DxvkSpecConstants::DxvkSpecConstants() { - - } - - - DxvkSpecConstants::~DxvkSpecConstants() { - - } - - - VkSpecializationInfo DxvkSpecConstants::getSpecInfo() const { - VkSpecializationInfo specInfo; - specInfo.mapEntryCount = m_map.size(); - specInfo.pMapEntries = m_map.data(); - specInfo.dataSize = m_data.size() * sizeof(uint32_t); - specInfo.pData = m_data.data(); - return specInfo; - } - - - void DxvkSpecConstants::setAsUint32(uint32_t specId, uint32_t value) { - uint32_t index = m_data.size(); - m_data.push_back(value); - - VkSpecializationMapEntry mapEntry; - mapEntry.constantID = specId; - mapEntry.offset = sizeof(uint32_t) * index; - mapEntry.size = sizeof(uint32_t); - m_map.push_back(mapEntry); - } - -} \ No newline at end of file diff --git a/src/dxvk/dxvk_spec_const.h b/src/dxvk/dxvk_spec_const.h deleted file mode 100644 index 3e5ec4abe..000000000 --- a/src/dxvk/dxvk_spec_const.h +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once - -#include "dxvk_limits.h" -#include "dxvk_shader.h" - -namespace dxvk { - - /** - * \briefS Specialization constant entry - * - * Used to pass a list of user-defined - * specialization constants to shaders. - */ - struct DxvkSpecConstant { - uint32_t specId; - uint32_t value; - }; - - - /** - * \brief Specialization constant info - * - * Accumulates specialization constant data for - * constants that use non-default values. - */ - class DxvkSpecConstants { - - public: - - DxvkSpecConstants(); - - ~DxvkSpecConstants(); - - /** - * \brief Sets specialization constant value - * - * If the given value is different from the constant's - * default value, this will store the new value and add - * a map entry so that it gets applied properly. Each - * constant may only be set once. - * \param [in] specId Specialization constant ID - * \param [in] value Specialization constant value - * \param [in] defaultValue Default value - */ - template - void set(uint32_t specId, T value, T defaultValue) { - if (value != defaultValue) - setAsUint32(specId, uint32_t(value)); - } - - /** - * \brief Sets specialization constant value - * - * Always passes the constant value to the driver. - * \param [in] specId Specialization constant ID - * \param [in] value Specialization constant value - */ - template - void set(uint32_t specId, T value) { - setAsUint32(specId, uint32_t(value)); - } - - /** - * \brief Generates specialization info structure - * \returns Specialization info for shader module - */ - VkSpecializationInfo getSpecInfo() const; - - private: - - std::vector m_data = { }; - std::vector m_map = { }; - - void setAsUint32(uint32_t specId, uint32_t value); - - }; - -} \ No newline at end of file diff --git a/src/dxvk/meson.build b/src/dxvk/meson.build index 93ebb1d3c..b0463108c 100644 --- a/src/dxvk/meson.build +++ b/src/dxvk/meson.build @@ -100,7 +100,6 @@ dxvk_src = files([ 'dxvk_shader.cpp', 'dxvk_shader_key.cpp', 'dxvk_signal.cpp', - 'dxvk_spec_const.cpp', 'dxvk_staging.cpp', 'dxvk_state_cache.cpp', 'dxvk_stats.cpp',