xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RHI: Add embedded shader source support via ShaderCompileDesc

Browse Source 
- Add ShaderLanguage enum (HLSL, GLSL, SPIRV)
- Extend ShaderCompileDesc with source/sourceLanguage fields
- D3D12Device::CompileShader supports both file and embedded source
- OpenGLDevice::CompileShader supports embedded GLSL source
- Refactor test_shader.cpp to use embedded source for both backends

This enables consistent shader compilation across D3D12 and OpenGL
backends while maintaining backend-specific shader language support.
This commit is contained in:
ssdfasd
2026-03-25 12:00:26 +08:00
parent 600892bbe2
commit 32c04b86b7
5 changed files with 178 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
tests/RHI/unit/test_shader.cpp
View File

@@ -1,54 +1,143 @@
#include "fixtures/RHITestFixture.h"
#include "XCEngine/RHI/RHIShader.h"
#include <cstring>
using namespace XCEngine::RHI;
TEST_P(RHITestFixture, Shader_Compile_EmptyDesc_ReturnsNullptr) {
RHIShader* shader = GetDevice()->CompileShader({});
ShaderCompileDesc desc = {};
RHIShader* shader = GetDevice()->CompileShader(desc);
EXPECT_EQ(shader, nullptr);
}
TEST_P(RHITestFixture, Shader_GetType_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
TEST_P(RHITestFixture, Shader_Compile_ValidVertexShader) {
ShaderCompileDesc desc = {};
if (GetBackendType() == RHIType::D3D12) {
desc.fileName = L"tests/RHI/D3D12/integration/quad/Res/Shader/quad.hlsl";
desc.entryPoint = L"MainVS";
desc.profile = L"vs_5_0";
} else {
desc.sourceLanguage = ShaderLanguage::GLSL;
static const char* vs = "#version 430\nin vec4 aPosition;\nvoid main() { gl_Position = aPosition; }";
desc.source.assign(vs, vs + strlen(vs));
desc.profile = L"vs";
}
RHIShader* shader = GetDevice()->CompileShader(desc);
if (shader != nullptr) {
EXPECT_TRUE(shader->IsValid());
EXPECT_EQ(shader->GetType(), ShaderType::Vertex);
EXPECT_NE(shader->GetNativeHandle(), nullptr);
shader->Shutdown();
delete shader;
}
}
TEST_P(RHITestFixture, Shader_IsValid_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
TEST_P(RHITestFixture, Shader_Compile_ValidFragmentShader) {
ShaderCompileDesc desc = {};
if (GetBackendType() == RHIType::D3D12) {
desc.fileName = L"tests/RHI/D3D12/integration/quad/Res/Shader/quad.hlsl";
desc.entryPoint = L"MainPS";
desc.profile = L"ps_5_0";
} else {
desc.sourceLanguage = ShaderLanguage::GLSL;
static const char* fs = "#version 430\nout vec4 c;\nvoid main() { c = vec4(1,0,0,1); }";
desc.source.assign(fs, fs + strlen(fs));
desc.profile = L"ps";
}
RHIShader* shader = GetDevice()->CompileShader(desc);
if (shader != nullptr) {
EXPECT_TRUE(shader->IsValid());
EXPECT_EQ(shader->GetType(), ShaderType::Fragment);
EXPECT_NE(shader->GetNativeHandle(), nullptr);
shader->Shutdown();
delete shader;
}
}
TEST_P(RHITestFixture, Shader_Bind_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
TEST_P(RHITestFixture, Shader_GetType_VertexShader) {
ShaderCompileDesc desc = {};
if (GetBackendType() == RHIType::D3D12) {
desc.fileName = L"tests/RHI/D3D12/integration/quad/Res/Shader/quad.hlsl";
desc.entryPoint = L"MainVS";
desc.profile = L"vs_5_0";
} else {
desc.sourceLanguage = ShaderLanguage::GLSL;
static const char* vs = "#version 430\nin vec4 aPosition;\nvoid main() { gl_Position = aPosition; }";
desc.source.assign(vs, vs + strlen(vs));
desc.profile = L"vs";
}
RHIShader* shader = GetDevice()->CompileShader(desc);
if (shader != nullptr) {
EXPECT_EQ(shader->GetType(), ShaderType::Vertex);
shader->Shutdown();
delete shader;
}
}
TEST_P(RHITestFixture, Shader_SetInt_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
TEST_P(RHITestFixture, Shader_GetType_FragmentShader) {
ShaderCompileDesc desc = {};
if (GetBackendType() == RHIType::D3D12) {
desc.fileName = L"tests/RHI/D3D12/integration/quad/Res/Shader/quad.hlsl";
desc.entryPoint = L"MainPS";
desc.profile = L"ps_5_0";
} else {
desc.sourceLanguage = ShaderLanguage::GLSL;
static const char* fs = "#version 430\nout vec4 c;\nvoid main() { c = vec4(1,0,0,1); }";
desc.source.assign(fs, fs + strlen(fs));
desc.profile = L"ps";
}
RHIShader* shader = GetDevice()->CompileShader(desc);
if (shader != nullptr) {
EXPECT_EQ(shader->GetType(), ShaderType::Fragment);
shader->Shutdown();
delete shader;
}
}
TEST_P(RHITestFixture, Shader_SetFloat_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
TEST_P(RHITestFixture, Shader_GetNativeHandle_ValidShader) {
ShaderCompileDesc desc = {};
if (GetBackendType() == RHIType::D3D12) {
desc.fileName = L"tests/RHI/D3D12/integration/quad/Res/Shader/quad.hlsl";
desc.entryPoint = L"MainVS";
desc.profile = L"vs_5_0";
} else {
desc.sourceLanguage = ShaderLanguage::GLSL;
static const char* vs = "#version 430\nin vec4 aPosition;\nvoid main() { gl_Position = aPosition; }";
desc.source.assign(vs, vs + strlen(vs));
desc.profile = L"vs";
}
RHIShader* shader = GetDevice()->CompileShader(desc);
if (shader != nullptr) {
void* handle = shader->GetNativeHandle();
EXPECT_NE(handle, nullptr);
shader->Shutdown();
delete shader;
}
}
TEST_P(RHITestFixture, Shader_SetVec3_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
}
TEST_P(RHITestFixture, Shader_Shutdown_Invalidates) {
ShaderCompileDesc desc = {};
if (GetBackendType() == RHIType::D3D12) {
desc.fileName = L"tests/RHI/D3D12/integration/quad/Res/Shader/quad.hlsl";
desc.entryPoint = L"MainVS";
desc.profile = L"vs_5_0";
} else {
desc.sourceLanguage = ShaderLanguage::GLSL;
static const char* vs = "#version 430\nin vec4 aPosition;\nvoid main() { gl_Position = aPosition; }";
desc.source.assign(vs, vs + strlen(vs));
desc.profile = L"vs";
}
TEST_P(RHITestFixture, Shader_SetVec4_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
}
TEST_P(RHITestFixture, Shader_SetMat4_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
}
TEST_P(RHITestFixture, Shader_GetNativeHandle_WithNullShader) {
RHIShader* shader = GetDevice()->CompileShader({});
EXPECT_EQ(shader, nullptr);
}
RHIShader* shader = GetDevice()->CompileShader(desc);
if (shader != nullptr) {
EXPECT_TRUE(shader->IsValid());
shader->Shutdown();
EXPECT_FALSE(shader->IsValid());
delete shader;
}
}