zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add VkShaderKey and start preparing VkShaderManager to be able to handle a lot more shader permutations

Browse source
This commit is contained in:
dpjudas 2023-04-04 01:00:08 +02:00 committed by Christoph Oelckers
parent e34ee1e462
commit ff6d412237
5 changed files with 81 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/rendering/vulkan/renderer/vk_renderpass.cpp
View file

@ -245,15 +245,7 @@ std::unique_ptr<VulkanPipeline> VkRenderPassSetup::CreatePipeline(const VkPipeli
GraphicsPipelineBuilder builder;
builder.Cache(fb->GetRenderPassManager()->GetCache());
VkShaderProgram *program;
if (key.SpecialEffect != EFF_NONE)
{
program = fb->GetShaderManager()->GetEffect(key.SpecialEffect, PassKey.DrawBuffers > 1 ? GBUFFER_PASS : NORMAL_PASS);
}
else
{
program = fb->GetShaderManager()->Get(key.EffectState, key.AlphaTest, PassKey.DrawBuffers > 1 ? GBUFFER_PASS : NORMAL_PASS);
}
VkShaderProgram *program = fb->GetShaderManager()->Get(key.ShaderKey, PassKey.DrawBuffers > 1 ? GBUFFER_PASS : NORMAL_PASS);
builder.AddVertexShader(program->vert.get());
builder.AddFragmentShader(program->frag.get());

47
src/common/rendering/vulkan/renderer/vk_renderpass.h
View file

@ -6,6 +6,7 @@
#include "hwrenderer/data/buffers.h"
#include "hwrenderer/postprocessing/hw_postprocess.h"
#include "hw_renderstate.h"
#include "common/rendering/vulkan/shaders/vk_shader.h"
#include <string.h>
#include <map>
@ -17,21 +18,29 @@ class VkPipelineKey
{
public:
FRenderStyle RenderStyle;
int SpecialEffect;
int EffectState;
int AlphaTest;
int DepthWrite;
int DepthTest;
int DepthFunc;
int DepthClamp;
int DepthBias;
int StencilTest;
int StencilPassOp;
int ColorMask;
int CullMode;
int VertexFormat;
int DrawType;
int NumTextureLayers;
union
{
struct
{
uint32_t DrawType : 3;
uint32_t CullMode : 2;
uint32_t ColorMask : 4;
uint32_t DepthWrite : 1;
uint32_t DepthTest : 1;
uint32_t DepthClamp : 1;
uint32_t DepthBias : 1;
uint32_t DepthFunc : 2;
uint32_t StencilTest : 1;
uint32_t StencilPassOp : 2;
uint32_t Unused : 14;
};
uint32_t AsDWORD = 0;
};
VkShaderKey ShaderKey;
int VertexFormat = 0;
int NumTextureLayers = 0;
bool operator<(const VkPipelineKey &other) const { return memcmp(this, &other, sizeof(VkPipelineKey)) < 0; }
bool operator==(const VkPipelineKey &other) const { return memcmp(this, &other, sizeof(VkPipelineKey)) == 0; }
@ -41,10 +50,10 @@ public:
class VkRenderPassKey
{
public:
int DepthStencil;
int Samples;
int DrawBuffers;
VkFormat DrawBufferFormat;
int DepthStencil = 0;
int Samples = 0;
int DrawBuffers = 0;
VkFormat DrawBufferFormat = VK_FORMAT_UNDEFINED;
bool operator<(const VkRenderPassKey &other) const { return memcmp(this, &other, sizeof(VkRenderPassKey)) < 0; }
bool operator==(const VkRenderPassKey &other) const { return memcmp(this, &other, sizeof(VkRenderPassKey)) == 0; }

16
src/common/rendering/vulkan/renderer/vk_renderstate.cpp
View file

@ -234,18 +234,18 @@ void VkRenderState::ApplyRenderPass(int dt)
pipelineKey.NumTextureLayers = max(pipelineKey.NumTextureLayers, SHADER_MIN_REQUIRED_TEXTURE_LAYERS);// Always force minimum 8 textures as the shader requires it
if (mSpecialEffect > EFF_NONE)
{
pipelineKey.SpecialEffect = mSpecialEffect;
pipelineKey.EffectState = 0;
pipelineKey.AlphaTest = false;
pipelineKey.ShaderKey.SpecialEffect = mSpecialEffect;
pipelineKey.ShaderKey.EffectState = 0;
pipelineKey.ShaderKey.AlphaTest = false;
}
else
{
int effectState = mMaterial.mOverrideShader >= 0 ? mMaterial.mOverrideShader : (mMaterial.mMaterial ? mMaterial.mMaterial->GetShaderIndex() : 0);
pipelineKey.SpecialEffect = EFF_NONE;
pipelineKey.EffectState = mTextureEnabled ? effectState : SHADER_NoTexture;
if (r_skipmats && pipelineKey.EffectState >= 3 && pipelineKey.EffectState <= 4)
pipelineKey.EffectState = 0;
pipelineKey.AlphaTest = mAlphaThreshold >= 0.f;
pipelineKey.ShaderKey.SpecialEffect = EFF_NONE;
pipelineKey.ShaderKey.EffectState = mTextureEnabled ? effectState : SHADER_NoTexture;
if (r_skipmats && pipelineKey.ShaderKey.EffectState >= 3 && pipelineKey.ShaderKey.EffectState <= 4)
pipelineKey.ShaderKey.EffectState = 0;
pipelineKey.ShaderKey.AlphaTest = mAlphaThreshold >= 0.f;
}
// Is this the one we already have?

12
src/common/rendering/vulkan/shaders/vk_shader.cpp
View file

@ -128,6 +128,18 @@ void VkShaderManager::Deinit()
RemoveVkPPShader(PPShaders.back());
}
VkShaderProgram* VkShaderManager::Get(const VkShaderKey& key, EPassType passType)
{
if (key.SpecialEffect != EFF_NONE)
{
return GetEffect(key.SpecialEffect, passType);
}
else
{
return Get(key.EffectState, key.AlphaTest, passType);
}
}
VkShaderProgram *VkShaderManager::GetEffect(int effect, EPassType passType)
{
if (compileIndex == -1 && effect >= 0 && effect < MAX_EFFECTS && mEffectShaders[passType][effect].frag)

34
src/common/rendering/vulkan/shaders/vk_shader.h
View file

@ -58,6 +58,33 @@ struct PushConstants
int padding1, padding2, padding3;
};
class VkShaderKey
{
public:
union
{
struct
{
uint32_t AlphaTest : 1;
uint32_t Simple2D : 1; // uFogEnabled == -3
uint32_t TextureMode : 3; // uTextureMode & 0xffff
uint32_t ClampY : 1; // uTextureMode & TEXF_ClampY
uint32_t Brightmap : 1; // uTextureMode & TEXF_Brightmap
uint32_t Detailmap : 1; // uTextureMode & TEXF_Detailmap
uint32_t Glowmap : 1; // uTextureMode & TEXF_Glowmap
uint32_t Unused : 23;
};
uint32_t AsDWORD = 0;
};
int SpecialEffect = 0;
int EffectState = 0;
bool operator<(const VkShaderKey& other) const { return memcmp(this, &other, sizeof(VkShaderKey)) < 0; }
bool operator==(const VkShaderKey& other) const { return memcmp(this, &other, sizeof(VkShaderKey)) == 0; }
bool operator!=(const VkShaderKey& other) const { return memcmp(this, &other, sizeof(VkShaderKey)) != 0; }
};
class VkShaderProgram
{
public:
@ -73,8 +100,8 @@ public:
void Deinit();
VkShaderProgram *GetEffect(int effect, EPassType passType);
VkShaderProgram *Get(unsigned int eff, bool alphateston, EPassType passType);
VkShaderProgram* Get(const VkShaderKey& key, EPassType passType);
bool CompileNextShader();
VkPPShader* GetVkShader(PPShader* shader);
@ -83,6 +110,9 @@ public:
void RemoveVkPPShader(VkPPShader* shader);
private:
VkShaderProgram* GetEffect(int effect, EPassType passType);
VkShaderProgram* Get(unsigned int eff, bool alphateston, EPassType passType);
std::unique_ptr<VulkanShader> LoadVertShader(FString shadername, const char *vert_lump, const char *defines);
std::unique_ptr<VulkanShader> LoadFragShader(FString shadername, const char *frag_lump, const char *material_lump, const char* mateffect_lump, const char *lightmodel_lump, const char *defines, bool alphatest, bool gbufferpass);