diff --git a/src/common/rendering/hwrenderer/data/shaderuniforms.h b/src/common/rendering/hwrenderer/data/shaderuniforms.h index 4b11a3755..d5abdea49 100644 --- a/src/common/rendering/hwrenderer/data/shaderuniforms.h +++ b/src/common/rendering/hwrenderer/data/shaderuniforms.h @@ -7,7 +7,6 @@ enum { LIGHTBUF_BINDINGPOINT = 1, - POSTPROCESS_BINDINGPOINT = 2, VIEWPOINT_BINDINGPOINT = 3, LIGHTNODES_BINDINGPOINT = 4, LIGHTLINES_BINDINGPOINT = 5, @@ -35,7 +34,7 @@ enum class UniformType class UniformFieldDesc { public: - UniformFieldDesc() { } + UniformFieldDesc() = default; UniformFieldDesc(const char *name, UniformType type, std::size_t offset) : Name(name), Type(type), Offset(offset) { } const char *Name; @@ -94,62 +93,3 @@ private: } } }; - -template -class ShaderUniforms -{ -public: - ShaderUniforms() - { - memset(&Values, 0, sizeof(Values)); - } - - ~ShaderUniforms() - { - if (mBuffer != nullptr) - delete mBuffer; - } - - int BindingPoint() const - { - return bindingpoint; - } - - FString CreateDeclaration(const char *name, const std::vector &fields) - { - mFields = fields; - return UniformBlockDecl::Create(name, fields, bindingpoint); - } - - void Init() - { - if (mBuffer == nullptr) - mBuffer = screen->CreateDataBuffer(bindingpoint, false, false); - } - - void SetData() - { - if (mBuffer != nullptr) - mBuffer->SetData(sizeof(T), &Values, BufferUsageType::Static); - } - - IDataBuffer* GetBuffer() const - { - // OpenGL needs to mess around with this in ways that should not be part of the interface. - return mBuffer; - } - - T *operator->() { return &Values; } - const T *operator->() const { return &Values; } - - T Values; - -private: - ShaderUniforms(const ShaderUniforms &) = delete; - ShaderUniforms &operator=(const ShaderUniforms &) = delete; - - IDataBuffer *mBuffer = nullptr; - std::vector mFields; -}; - - diff --git a/src/common/rendering/vulkan/buffers/vk_buffer.cpp b/src/common/rendering/vulkan/buffers/vk_buffer.cpp index f9e94ee3f..aea2bd50b 100644 --- a/src/common/rendering/vulkan/buffers/vk_buffer.cpp +++ b/src/common/rendering/vulkan/buffers/vk_buffer.cpp @@ -86,7 +86,6 @@ IDataBuffer* VkBufferManager::CreateDataBuffer(int bindingpoint, bool ssbo, bool case LIGHTLINES_BINDINGPOINT: LightLines = buffer; break; case LIGHTLIST_BINDINGPOINT: LightList = buffer; break; case BONEBUF_BINDINGPOINT: BoneBufferSSO = buffer; break; - case POSTPROCESS_BINDINGPOINT: break; default: break; }