noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #111013 from stuartcarnie/shader_container_ext

Browse Source 
Renderer: Move `reflect_spirv` to `RenderingShaderContainer`
This commit is contained in:
Thaddeus Crews
2025-10-01 17:54:09 -05:00
parent 25de1a353a 65e8b0951b
commit 4594de69fd
12 changed files with 425 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/metal/rendering_shader_container_metal.h
View File

@@ -292,7 +292,7 @@ protected:
virtual uint32_t _format() const override;
virtual uint32_t _format_version() const override;
virtual bool _set_code_from_spirv(const Vector<RenderingDeviceCommons::ShaderStageSPIRVData> &p_spirv) override;
virtual bool _set_code_from_spirv(Span<ReflectedShaderStage> p_spirv) override;
};
class RenderingShaderContainerFormatMetal : public RenderingShaderContainerFormat {

9
drivers/metal/rendering_shader_container_metal.mm
View File

@@ -252,7 +252,7 @@ Error RenderingShaderContainerMetal::compile_metal_source(const char *p_source,
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability"
bool RenderingShaderContainerMetal::_set_code_from_spirv(const Vector<RenderingDeviceCommons::ShaderStageSPIRVData> &p_spirv) {
bool RenderingShaderContainerMetal::_set_code_from_spirv(Span<ReflectedShaderStage> p_spirv) {
using namespace spirv_cross;
using spirv_cross::CompilerMSL;
using spirv_cross::Resource;
@@ -353,12 +353,11 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const Vector<RenderingD
for (uint32_t i = 0; i < p_spirv.size(); i++) {
StageData &stage_data = mtl_shaders.write[i];
RD::ShaderStageSPIRVData const &v = p_spirv[i];
const ReflectedShaderStage &v = p_spirv[i];
RD::ShaderStage stage = v.shader_stage;
char const *stage_name = RD::SHADER_STAGE_NAMES[stage];
uint32_t const *const ir = reinterpret_cast<uint32_t const *const>(v.spirv.ptr());
size_t word_count = v.spirv.size() / sizeof(uint32_t);
Parser parser(ir, word_count);
Span<uint32_t> spirv = v.spirv();
Parser parser(spirv.ptr(), spirv.size());
try {
parser.parse();
} catch (CompilerError &e) {