mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-18 03:44:32 +01:00
Make ShaderSet support more than just fshader/vshader
This commit is contained in:
1 parent
3de4a38527
commit
e56f251f74
5 files changed
+96
-60
No files matched your search
@@ -77,7 +77,7 @@ static const char * const glsl_vsCol =
|
||||
static const char * const hlslVsCol =
|
||||
"struct VS_INPUT { float3 Position : POSITION; float4 Color0 : COLOR0; };\n"
|
||||
"struct VS_OUTPUT { float4 Position : POSITION; float4 Color0 : COLOR0; };\n"
|
||||
"float4x4 WorldViewProj;\n"
|
||||
"float4x4 WorldViewProj : register(c0);\n"
|
||||
"VS_OUTPUT main(VS_INPUT input) {\n"
|
||||
" VS_OUTPUT output;\n"
|
||||
" output.Position = mul(float4(input.Position, 1.0), WorldViewProj);\n"
|
||||
@@ -101,6 +101,10 @@ static const char * const vulkan_vsCol =
|
||||
" gl_Position = myBufferVals.WorldViewProj * pos;\n"
|
||||
"}\n";
|
||||
|
||||
static const UniformBufferDesc vsColDesc{ { { 0, UniformType::MATRIX4X4, 0 } } };
|
||||
struct VsColUB {
|
||||
float WorldViewProj[16];
|
||||
};
|
||||
|
||||
static const char * const glsl_vsTexCol =
|
||||
"attribute vec3 Position;\n"
|
||||
@@ -118,7 +122,7 @@ static const char * const glsl_vsTexCol =
|
||||
static const char * const hlslVsTexCol =
|
||||
"struct VS_INPUT { float3 Position : POSITION; float2 Texcoord0 : TEXCOORD0; float4 Color0 : COLOR0; };\n"
|
||||
"struct VS_OUTPUT { float4 Position : POSITION; float2 Texcoord0 : TEXCOORD0; float4 Color0 : COLOR0; };\n"
|
||||
"float4x4 WorldViewProj;\n"
|
||||
"float4x4 WorldViewProj : register(c0);\n"
|
||||
"VS_OUTPUT main(VS_INPUT input) {\n"
|
||||
" VS_OUTPUT output;\n"
|
||||
" output.Position = mul(float4(input.Position, 1.0), WorldViewProj);\n"
|
||||
@@ -146,6 +150,10 @@ static const char * const vulkan_vsTexCol =
|
||||
" gl_Position = myBufferVals.WorldViewProj * pos;\n"
|
||||
"}\n";
|
||||
|
||||
static const UniformBufferDesc vsTexColDesc{ { { 0, UniformType::MATRIX4X4, 0 } } };
|
||||
struct VsTexColUB {
|
||||
float WorldViewProj[16];
|
||||
};
|
||||
|
||||
void DrawContext::CreatePresets() {
|
||||
vsPresets_[VS_TEXTURE_COLOR_2D] = CreateShaderModule(ShaderStage::VERTEX, glsl_vsTexCol, hlslVsTexCol, vulkan_vsTexCol);
|
||||
@@ -154,8 +162,8 @@ void DrawContext::CreatePresets() {
|
||||
fsPresets_[FS_TEXTURE_COLOR_2D] = CreateShaderModule(ShaderStage::FRAGMENT, glsl_fsTexCol, hlslFsTexCol, vulkan_fsTexCol);
|
||||
fsPresets_[FS_COLOR_2D] = CreateShaderModule(ShaderStage::FRAGMENT, glsl_fsCol, hlslFsCol, vulkan_fsCol);
|
||||
|
||||
ssPresets_[SS_TEXTURE_COLOR_2D] = CreateShaderSet(vsPresets_[VS_TEXTURE_COLOR_2D], fsPresets_[FS_TEXTURE_COLOR_2D]);
|
||||
ssPresets_[SS_COLOR_2D] = CreateShaderSet(vsPresets_[VS_COLOR_2D], fsPresets_[FS_COLOR_2D]);
|
||||
ssPresets_[SS_TEXTURE_COLOR_2D] = CreateShaderSet({ {vsPresets_[VS_TEXTURE_COLOR_2D], fsPresets_[FS_TEXTURE_COLOR_2D]} });
|
||||
ssPresets_[SS_COLOR_2D] = CreateShaderSet({{vsPresets_[VS_COLOR_2D], fsPresets_[FS_COLOR_2D]}});
|
||||
}
|
||||
|
||||
DrawContext::~DrawContext() {
|
||||
|
||||
@@ -336,6 +336,24 @@ enum class ShaderLanguage {
|
||||
HLSL_D3D11,
|
||||
};
|
||||
|
||||
enum class UniformType : int8_t {
|
||||
FLOAT, FLOAT2, FLOAT3, FLOAT4,
|
||||
MATRIX4X4,
|
||||
};
|
||||
|
||||
// For emulation of uniform buffers on D3D9/GL
|
||||
struct UniformDesc {
|
||||
int16_t offset;
|
||||
UniformType type;
|
||||
int8_t reg; // For D3D
|
||||
|
||||
// TODO: Support array elements etc.
|
||||
};
|
||||
|
||||
struct UniformBufferDesc {
|
||||
std::vector<UniformDesc> uniforms;
|
||||
};
|
||||
|
||||
class ShaderModule : public RefCountedObject {
|
||||
public:
|
||||
virtual ShaderStage GetStage() const = 0;
|
||||
@@ -343,7 +361,7 @@ public:
|
||||
|
||||
class ShaderSet : public RefCountedObject {
|
||||
public:
|
||||
// TODO: Make some faster way of doing these. Support uniform buffers (and fake them on GL 2.0?)
|
||||
// TODO: Use a uniform-buffer based interface instead.
|
||||
virtual void SetVector(const char *name, float *value, int n) = 0;
|
||||
virtual void SetMatrix4x4(const char *name, const float value[16]) = 0;
|
||||
};
|
||||
@@ -417,6 +435,10 @@ struct RasterStateDesc {
|
||||
Facing facing;
|
||||
};
|
||||
|
||||
struct ShaderSetDesc {
|
||||
std::vector<ShaderModule *> shaders;
|
||||
};
|
||||
|
||||
class DrawContext : public RefCountedObject {
|
||||
public:
|
||||
virtual ~DrawContext();
|
||||
@@ -428,7 +450,7 @@ public:
|
||||
virtual SamplerState *CreateSamplerState(const SamplerStateDesc &desc) = 0;
|
||||
virtual RasterState *CreateRasterState(const RasterStateDesc &desc) = 0;
|
||||
virtual Buffer *CreateBuffer(size_t size, uint32_t usageFlags) = 0;
|
||||
virtual ShaderSet *CreateShaderSet(ShaderModule *vshader, ShaderModule *fshader) = 0;
|
||||
virtual ShaderSet *CreateShaderSet(const ShaderSetDesc &desc) = 0;
|
||||
virtual InputLayout *CreateVertexFormat(const std::vector<VertexComponent> &components, int stride, ShaderModule *vshader) = 0;
|
||||
|
||||
virtual Texture *CreateTexture() = 0; // To be later filled in by ->LoadFromFile or similar.
|
||||
|
||||
@@ -458,7 +458,7 @@ public:
|
||||
SamplerState *CreateSamplerState(const SamplerStateDesc &desc) override;
|
||||
RasterState *CreateRasterState(const RasterStateDesc &desc) override;
|
||||
Buffer *CreateBuffer(size_t size, uint32_t usageFlags) override;
|
||||
ShaderSet *CreateShaderSet(ShaderModule *vshader, ShaderModule *fshader) override;
|
||||
ShaderSet *CreateShaderSet(const ShaderSetDesc &desc) override;
|
||||
InputLayout *CreateVertexFormat(const std::vector<VertexComponent> &components, int stride, ShaderModule *vshader) override;
|
||||
Texture *CreateTexture() override;
|
||||
Texture *CreateTexture(TextureType type, DataFormat format, int width, int height, int depth, int mipLevels) override;
|
||||
@@ -543,14 +543,20 @@ ShaderModule *D3D9Context::CreateShaderModule(ShaderStage stage, const char *gls
|
||||
}
|
||||
}
|
||||
|
||||
ShaderSet *D3D9Context::CreateShaderSet(ShaderModule *vshader, ShaderModule *fshader) {
|
||||
if (!vshader || !fshader) {
|
||||
ELOG("ShaderSet requires both a valid vertex and a fragment shader: %p %p", vshader, fshader);
|
||||
ShaderSet *D3D9Context::CreateShaderSet(const ShaderSetDesc &desc) {
|
||||
if (!desc.shaders.size()) {
|
||||
ELOG("ShaderSet requires at least one shader");
|
||||
return NULL;
|
||||
}
|
||||
D3D9ShaderSet *shaderSet = new D3D9ShaderSet(device_);
|
||||
shaderSet->vshader = static_cast<D3D9ShaderModule *>(vshader);
|
||||
shaderSet->pshader = static_cast<D3D9ShaderModule *>(fshader);
|
||||
for (auto iter : desc.shaders) {
|
||||
if (iter->GetStage() == ShaderStage::FRAGMENT) {
|
||||
shaderSet->pshader = static_cast<D3D9ShaderModule *>(iter);
|
||||
}
|
||||
else if (iter->GetStage() == ShaderStage::VERTEX) {
|
||||
shaderSet->vshader = static_cast<D3D9ShaderModule *>(iter);
|
||||
}
|
||||
}
|
||||
return shaderSet;
|
||||
}
|
||||
|
||||
|
||||
@@ -364,8 +364,9 @@ public:
|
||||
}
|
||||
~OpenGLShaderSet() {
|
||||
unregister_gl_resource_holder(this);
|
||||
vshader->Release();
|
||||
fshader->Release();
|
||||
for (auto iter : shaders) {
|
||||
iter->Release();
|
||||
}
|
||||
glDeleteProgram(program_);
|
||||
}
|
||||
bool Link();
|
||||
@@ -380,18 +381,19 @@ public:
|
||||
|
||||
void GLLost() override {
|
||||
program_ = 0;
|
||||
vshader->Unset();
|
||||
fshader->Unset();
|
||||
for (auto iter : shaders) {
|
||||
iter->Unset();
|
||||
}
|
||||
}
|
||||
|
||||
void GLRestore() override {
|
||||
vshader->Compile(vshader->GetSource().c_str());
|
||||
fshader->Compile(fshader->GetSource().c_str());
|
||||
for (auto iter : shaders) {
|
||||
iter->Compile(iter->GetSource().c_str());
|
||||
}
|
||||
Link();
|
||||
}
|
||||
|
||||
OpenGLShaderModule *vshader;
|
||||
OpenGLShaderModule *fshader;
|
||||
std::vector<OpenGLShaderModule *> shaders;
|
||||
|
||||
private:
|
||||
GLuint program_;
|
||||
@@ -408,7 +410,7 @@ public:
|
||||
SamplerState *CreateSamplerState(const SamplerStateDesc &desc) override;
|
||||
RasterState *CreateRasterState(const RasterStateDesc &desc) override;
|
||||
Buffer *CreateBuffer(size_t size, uint32_t usageFlags) override;
|
||||
ShaderSet *CreateShaderSet(ShaderModule *vshader, ShaderModule *fshader) override;
|
||||
ShaderSet *CreateShaderSet(const ShaderSetDesc &desc) override;
|
||||
InputLayout *CreateVertexFormat(const std::vector<VertexComponent> &components, int stride, ShaderModule *vshader) override;
|
||||
Texture *CreateTexture(TextureType type, DataFormat format, int width, int height, int depth, int mipLevels) override;
|
||||
Texture *CreateTexture() override;
|
||||
@@ -804,16 +806,16 @@ Buffer *OpenGLContext::CreateBuffer(size_t size, uint32_t usageFlags) {
|
||||
return new OpenGLBuffer(size, usageFlags);
|
||||
}
|
||||
|
||||
ShaderSet *OpenGLContext::CreateShaderSet(ShaderModule *vshader, ShaderModule *fshader) {
|
||||
if (!vshader || !fshader) {
|
||||
ELOG("ShaderSet requires both a valid vertex and a fragment shader: %p %p", vshader, fshader);
|
||||
ShaderSet *OpenGLContext::CreateShaderSet(const ShaderSetDesc &desc) {
|
||||
if (!desc.shaders.size()) {
|
||||
ELOG("ShaderSet requires at least one shader");
|
||||
return NULL;
|
||||
}
|
||||
OpenGLShaderSet *shaderSet = new OpenGLShaderSet();
|
||||
vshader->AddRef();
|
||||
fshader->AddRef();
|
||||
shaderSet->vshader = static_cast<OpenGLShaderModule *>(vshader);
|
||||
shaderSet->fshader = static_cast<OpenGLShaderModule *>(fshader);
|
||||
for (auto iter : desc.shaders) {
|
||||
iter->AddRef();
|
||||
shaderSet->shaders.push_back(static_cast<OpenGLShaderModule *>(iter));
|
||||
}
|
||||
if (shaderSet->Link()) {
|
||||
return shaderSet;
|
||||
} else {
|
||||
@@ -848,8 +850,9 @@ ShaderModule *OpenGLContext::CreateShaderModule(ShaderStage stage, const char *g
|
||||
|
||||
bool OpenGLShaderSet::Link() {
|
||||
program_ = glCreateProgram();
|
||||
glAttachShader(program_, vshader->GetShader());
|
||||
glAttachShader(program_, fshader->GetShader());
|
||||
for (auto iter : shaders) {
|
||||
glAttachShader(program_, iter->GetShader());
|
||||
}
|
||||
|
||||
// Bind all the common vertex data points. Mismatching ones will be ignored.
|
||||
glBindAttribLocation(program_, SEM_POSITION, "Position");
|
||||
|
||||
@@ -335,8 +335,9 @@ public:
|
||||
ubo_ = new uint8_t[uboSize_];
|
||||
}
|
||||
~VKShaderSet() {
|
||||
vshader->Release();
|
||||
fshader->Release();
|
||||
for (auto iter : shaders) {
|
||||
iter->Release();
|
||||
}
|
||||
delete[] ubo_;
|
||||
}
|
||||
bool Link();
|
||||
@@ -355,8 +356,7 @@ public:
|
||||
return uboSize_;
|
||||
}
|
||||
|
||||
VKShaderModule *vshader;
|
||||
VKShaderModule *fshader;
|
||||
std::vector<VKShaderModule *> shaders;
|
||||
|
||||
private:
|
||||
uint8_t *ubo_;
|
||||
@@ -412,7 +412,7 @@ public:
|
||||
InputLayout *CreateVertexFormat(const std::vector<VertexComponent> &components, int stride, ShaderModule *vshader) override;
|
||||
SamplerState *CreateSamplerState(const SamplerStateDesc &desc) override;
|
||||
RasterState *CreateRasterState(const RasterStateDesc &desc) override;
|
||||
ShaderSet *CreateShaderSet(ShaderModule *vshader, ShaderModule *fshader) override;
|
||||
ShaderSet *CreateShaderSet(const ShaderSetDesc &desc) override;
|
||||
// The implementation makes the choice of which shader code to use.
|
||||
ShaderModule *CreateShaderModule(ShaderStage stage, const char *glsl_source, const char *hlsl_source, const char *vulkan_source) override;
|
||||
|
||||
@@ -859,22 +859,19 @@ VkPipeline VKContext::GetOrCreatePipeline() {
|
||||
return iter->second;
|
||||
}
|
||||
|
||||
VkPipelineShaderStageCreateInfo stages[2];
|
||||
stages[0].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
|
||||
stages[0].pNext = nullptr;
|
||||
stages[0].pSpecializationInfo = nullptr;
|
||||
stages[0].stage = VK_SHADER_STAGE_VERTEX_BIT;
|
||||
stages[0].module = curShaderSet_->vshader->Get();
|
||||
stages[0].pName = "main";
|
||||
stages[0].flags = 0;
|
||||
|
||||
stages[1].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
|
||||
stages[1].pNext = nullptr;
|
||||
stages[1].pSpecializationInfo = nullptr;
|
||||
stages[1].stage = VK_SHADER_STAGE_FRAGMENT_BIT;
|
||||
stages[1].module = curShaderSet_->fshader->Get();
|
||||
stages[1].pName = "main";
|
||||
stages[1].flags = 0;
|
||||
std::vector<VkPipelineShaderStageCreateInfo> stages;
|
||||
stages.resize(curShaderSet_->shaders.size());
|
||||
int i = 0;
|
||||
for (auto &iter : curShaderSet_->shaders) {
|
||||
VkPipelineShaderStageCreateInfo &stage = stages[i++];
|
||||
stage.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
|
||||
stage.pNext = nullptr;
|
||||
stage.pSpecializationInfo = nullptr;
|
||||
stage.stage = StageToVulkan(iter->GetStage());
|
||||
stage.module = iter->Get();
|
||||
stage.pName = "main";
|
||||
stage.flags = 0;
|
||||
}
|
||||
|
||||
VkPipelineColorBlendStateCreateInfo colorBlend;
|
||||
VkPipelineColorBlendAttachmentState attachment0;
|
||||
@@ -915,8 +912,8 @@ VkPipeline VKContext::GetOrCreatePipeline() {
|
||||
VkGraphicsPipelineCreateInfo info = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO };
|
||||
info.pNext = nullptr;
|
||||
info.flags = 0;
|
||||
info.stageCount = 2;
|
||||
info.pStages = stages;
|
||||
info.stageCount = (uint32_t)stages.size();
|
||||
info.pStages = stages.data();
|
||||
info.pColorBlendState = &colorBlend;
|
||||
info.pDepthStencilState = &depthStencil;
|
||||
info.pDynamicState = &dynamicInfo;
|
||||
@@ -1038,16 +1035,16 @@ Buffer *VKContext::CreateBuffer(size_t size, uint32_t usageFlags) {
|
||||
return new Thin3DVKBuffer(size, usageFlags);
|
||||
}
|
||||
|
||||
ShaderSet *VKContext::CreateShaderSet(ShaderModule *vshader, ShaderModule *fshader) {
|
||||
if (!vshader || !fshader) {
|
||||
ELOG("ShaderSet requires both a valid vertex and a fragment shader: %p %p", vshader, fshader);
|
||||
ShaderSet *VKContext::CreateShaderSet(const ShaderSetDesc &desc) {
|
||||
if (!desc.shaders.size()) {
|
||||
ELOG("ShaderSet requires at least one shader");
|
||||
return NULL;
|
||||
}
|
||||
VKShaderSet *shaderSet = new VKShaderSet();
|
||||
vshader->AddRef();
|
||||
fshader->AddRef();
|
||||
shaderSet->vshader = static_cast<VKShaderModule *>(vshader);
|
||||
shaderSet->fshader = static_cast<VKShaderModule *>(fshader);
|
||||
for (auto iter : desc.shaders) {
|
||||
iter->AddRef();
|
||||
shaderSet->shaders.push_back(static_cast<VKShaderModule *>(iter));
|
||||
}
|
||||
if (shaderSet->Link()) {
|
||||
return shaderSet;
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user