|
|
@@ -32,6 +32,8 @@
|
|
|
|
|
|
#include "core/io/compression.h"
|
|
|
|
|
|
+#include "thirdparty/spirv-reflect/spirv_reflect.h"
|
|
|
+
|
|
|
static inline uint32_t aligned_to(uint32_t p_size, uint32_t p_alignment) {
|
|
|
if (p_size % p_alignment) {
|
|
|
return p_size + (p_alignment - (p_size % p_alignment));
|
|
|
@@ -40,6 +42,23 @@ static inline uint32_t aligned_to(uint32_t p_size, uint32_t p_alignment) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+RenderingShaderContainer::ReflectedShaderStage::ReflectedShaderStage() :
|
|
|
+ _module(memnew(SpvReflectShaderModule)) {
|
|
|
+}
|
|
|
+
|
|
|
+RenderingShaderContainer::ReflectedShaderStage::~ReflectedShaderStage() {
|
|
|
+ spvReflectDestroyShaderModule(_module);
|
|
|
+ memdelete(_module);
|
|
|
+}
|
|
|
+
|
|
|
+const SpvReflectShaderModule &RenderingShaderContainer::ReflectedShaderStage::module() const {
|
|
|
+ return *_module;
|
|
|
+}
|
|
|
+
|
|
|
+const Span<uint32_t> RenderingShaderContainer::ReflectedShaderStage::spirv() const {
|
|
|
+ return _spirv_data.span().reinterpret<uint32_t>();
|
|
|
+}
|
|
|
+
|
|
|
uint32_t RenderingShaderContainer::_from_bytes_header_extra_data(const uint8_t *p_bytes) {
|
|
|
return 0;
|
|
|
}
|
|
|
@@ -100,18 +119,366 @@ uint32_t RenderingShaderContainer::_to_bytes_footer_extra_data(uint8_t *) const
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-void RenderingShaderContainer::_set_from_shader_reflection_post(const String &p_shader_name, const RenderingDeviceCommons::ShaderReflection &p_reflection) {
|
|
|
+void RenderingShaderContainer::_set_from_shader_reflection_post(const RenderingDeviceCommons::ShaderReflection &p_reflection) {
|
|
|
// Do nothing.
|
|
|
}
|
|
|
|
|
|
-void RenderingShaderContainer::set_from_shader_reflection(const String &p_shader_name, const RenderingDeviceCommons::ShaderReflection &p_reflection) {
|
|
|
+Error RenderingShaderContainer::reflect_spirv(const String &p_shader_name, Span<RenderingDeviceCommons::ShaderStageSPIRVData> p_spirv, LocalVector<ReflectedShaderStage> &r_refl) {
|
|
|
+ using RDC = RenderingDeviceCommons;
|
|
|
+ RDC::ShaderReflection reflection;
|
|
|
+
|
|
|
+ const uint32_t spirv_size = p_spirv.size() + 0;
|
|
|
+ r_refl.resize(spirv_size);
|
|
|
+
|
|
|
+ for (uint32_t i = 0; i < spirv_size; i++) {
|
|
|
+ RDC::ShaderStage stage = p_spirv[i].shader_stage;
|
|
|
+ RDC::ShaderStage stage_flag = (RDC::ShaderStage)(1 << p_spirv[i].shader_stage);
|
|
|
+ r_refl[i].shader_stage = p_spirv[i].shader_stage;
|
|
|
+ r_refl[i]._spirv_data = p_spirv[i].spirv;
|
|
|
+
|
|
|
+ if (p_spirv[i].shader_stage == RDC::SHADER_STAGE_COMPUTE) {
|
|
|
+ reflection.is_compute = true;
|
|
|
+ ERR_FAIL_COND_V_MSG(spirv_size != 1, FAILED,
|
|
|
+ "Compute shaders can only receive one stage, dedicated to compute.");
|
|
|
+ }
|
|
|
+ ERR_FAIL_COND_V_MSG(reflection.stages_bits.has_flag(stage_flag), FAILED,
|
|
|
+ "Stage " + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + " submitted more than once.");
|
|
|
+
|
|
|
+ {
|
|
|
+ SpvReflectShaderModule &module = *r_refl.ptr()[i]._module;
|
|
|
+ const uint8_t *spirv = p_spirv[i].spirv.ptr();
|
|
|
+ SpvReflectResult result = spvReflectCreateShaderModule2(SPV_REFLECT_MODULE_FLAG_NO_COPY, p_spirv[i].spirv.size(), spirv, &module);
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed parsing shader.");
|
|
|
+
|
|
|
+ for (uint32_t j = 0; j < module.capability_count; j++) {
|
|
|
+ if (module.capabilities[j].value == SpvCapabilityMultiView) {
|
|
|
+ reflection.has_multiview = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (reflection.is_compute) {
|
|
|
+ reflection.compute_local_size[0] = module.entry_points->local_size.x;
|
|
|
+ reflection.compute_local_size[1] = module.entry_points->local_size.y;
|
|
|
+ reflection.compute_local_size[2] = module.entry_points->local_size.z;
|
|
|
+ }
|
|
|
+ uint32_t binding_count = 0;
|
|
|
+ result = spvReflectEnumerateDescriptorBindings(&module, &binding_count, nullptr);
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed enumerating descriptor bindings.");
|
|
|
+
|
|
|
+ if (binding_count > 0) {
|
|
|
+ // Parse bindings.
|
|
|
+
|
|
|
+ Vector<SpvReflectDescriptorBinding *> bindings;
|
|
|
+ bindings.resize(binding_count);
|
|
|
+ result = spvReflectEnumerateDescriptorBindings(&module, &binding_count, bindings.ptrw());
|
|
|
+
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed getting descriptor bindings.");
|
|
|
+
|
|
|
+ for (uint32_t j = 0; j < binding_count; j++) {
|
|
|
+ const SpvReflectDescriptorBinding &binding = *bindings[j];
|
|
|
+
|
|
|
+ RDC::ShaderUniform uniform;
|
|
|
+
|
|
|
+ bool need_array_dimensions = false;
|
|
|
+ bool need_block_size = false;
|
|
|
+ bool may_be_writable = false;
|
|
|
+
|
|
|
+ switch (binding.descriptor_type) {
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_SAMPLER: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_SAMPLER;
|
|
|
+ need_array_dimensions = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE;
|
|
|
+ need_array_dimensions = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_SAMPLED_IMAGE: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_TEXTURE;
|
|
|
+ need_array_dimensions = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_IMAGE: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_IMAGE;
|
|
|
+ need_array_dimensions = true;
|
|
|
+ may_be_writable = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_TEXTURE_BUFFER;
|
|
|
+ need_array_dimensions = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_IMAGE_BUFFER;
|
|
|
+ need_array_dimensions = true;
|
|
|
+ may_be_writable = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_BUFFER: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_UNIFORM_BUFFER;
|
|
|
+ need_block_size = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_BUFFER: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_STORAGE_BUFFER;
|
|
|
+ need_block_size = true;
|
|
|
+ may_be_writable = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: {
|
|
|
+ ERR_PRINT("Dynamic uniform buffer not supported.");
|
|
|
+ continue;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: {
|
|
|
+ ERR_PRINT("Dynamic storage buffer not supported.");
|
|
|
+ continue;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: {
|
|
|
+ uniform.type = RDC::UNIFORM_TYPE_INPUT_ATTACHMENT;
|
|
|
+ need_array_dimensions = true;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR: {
|
|
|
+ ERR_PRINT("Acceleration structure not supported.");
|
|
|
+ continue;
|
|
|
+ } break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (need_array_dimensions) {
|
|
|
+ if (binding.array.dims_count == 0) {
|
|
|
+ uniform.length = 1;
|
|
|
+ } else {
|
|
|
+ for (uint32_t k = 0; k < binding.array.dims_count; k++) {
|
|
|
+ if (k == 0) {
|
|
|
+ uniform.length = binding.array.dims[0];
|
|
|
+ } else {
|
|
|
+ uniform.length *= binding.array.dims[k];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ } else if (need_block_size) {
|
|
|
+ uniform.length = binding.block.size;
|
|
|
+ } else {
|
|
|
+ uniform.length = 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (may_be_writable) {
|
|
|
+ if (binding.descriptor_type == SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_IMAGE) {
|
|
|
+ uniform.writable = !(binding.decoration_flags & SPV_REFLECT_DECORATION_NON_WRITABLE);
|
|
|
+ } else {
|
|
|
+ uniform.writable = !(binding.decoration_flags & SPV_REFLECT_DECORATION_NON_WRITABLE) && !(binding.block.decoration_flags & SPV_REFLECT_DECORATION_NON_WRITABLE);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ uniform.writable = false;
|
|
|
+ }
|
|
|
+
|
|
|
+ uniform.binding = binding.binding;
|
|
|
+ uint32_t set = binding.set;
|
|
|
+
|
|
|
+ ERR_FAIL_COND_V_MSG(set >= RDC::MAX_UNIFORM_SETS, FAILED,
|
|
|
+ "On shader stage '" + String(RDC::SHADER_STAGE_NAMES[stage]) + "', uniform '" + binding.name + "' uses a set (" + itos(set) + ") index larger than what is supported (" + itos(RDC::MAX_UNIFORM_SETS) + ").");
|
|
|
+
|
|
|
+ if (set < (uint32_t)reflection.uniform_sets.size()) {
|
|
|
+ // Check if this already exists.
|
|
|
+ bool exists = false;
|
|
|
+ for (int k = 0; k < reflection.uniform_sets[set].size(); k++) {
|
|
|
+ if (reflection.uniform_sets[set][k].binding == uniform.binding) {
|
|
|
+ // Already exists, verify that it's the same type.
|
|
|
+ ERR_FAIL_COND_V_MSG(reflection.uniform_sets[set][k].type != uniform.type, FAILED,
|
|
|
+ "On shader stage '" + String(RDC::SHADER_STAGE_NAMES[stage]) + "', uniform '" + binding.name + "' trying to reuse location for set=" + itos(set) + ", binding=" + itos(uniform.binding) + " with different uniform type.");
|
|
|
+
|
|
|
+ // Also, verify that it's the same size.
|
|
|
+ ERR_FAIL_COND_V_MSG(reflection.uniform_sets[set][k].length != uniform.length, FAILED,
|
|
|
+ "On shader stage '" + String(RDC::SHADER_STAGE_NAMES[stage]) + "', uniform '" + binding.name + "' trying to reuse location for set=" + itos(set) + ", binding=" + itos(uniform.binding) + " with different uniform size.");
|
|
|
+
|
|
|
+ // Also, verify that it has the same writability.
|
|
|
+ ERR_FAIL_COND_V_MSG(reflection.uniform_sets[set][k].writable != uniform.writable, FAILED,
|
|
|
+ "On shader stage '" + String(RDC::SHADER_STAGE_NAMES[stage]) + "', uniform '" + binding.name + "' trying to reuse location for set=" + itos(set) + ", binding=" + itos(uniform.binding) + " with different writability.");
|
|
|
+
|
|
|
+ // Just append stage mask and return.
|
|
|
+ reflection.uniform_sets.write[set].write[k].stages.set_flag(stage_flag);
|
|
|
+ exists = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (exists) {
|
|
|
+ continue; // Merged.
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ uniform.stages.set_flag(stage_flag);
|
|
|
+
|
|
|
+ if (set >= (uint32_t)reflection.uniform_sets.size()) {
|
|
|
+ reflection.uniform_sets.resize(set + 1);
|
|
|
+ }
|
|
|
+
|
|
|
+ reflection.uniform_sets.write[set].push_back(uniform);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ {
|
|
|
+ // Specialization constants.
|
|
|
+
|
|
|
+ uint32_t sc_count = 0;
|
|
|
+ result = spvReflectEnumerateSpecializationConstants(&module, &sc_count, nullptr);
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed enumerating specialization constants.");
|
|
|
+
|
|
|
+ if (sc_count) {
|
|
|
+ Vector<SpvReflectSpecializationConstant *> spec_constants;
|
|
|
+ spec_constants.resize(sc_count);
|
|
|
+
|
|
|
+ result = spvReflectEnumerateSpecializationConstants(&module, &sc_count, spec_constants.ptrw());
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed obtaining specialization constants.");
|
|
|
+
|
|
|
+ for (uint32_t j = 0; j < sc_count; j++) {
|
|
|
+ int32_t existing = -1;
|
|
|
+ RDC::ShaderSpecializationConstant sconst;
|
|
|
+ SpvReflectSpecializationConstant *spc = spec_constants[j];
|
|
|
+
|
|
|
+ sconst.constant_id = spc->constant_id;
|
|
|
+ sconst.int_value = 0; // Clear previous value JIC.
|
|
|
+ switch (spc->constant_type) {
|
|
|
+ case SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL: {
|
|
|
+ sconst.type = RDC::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_BOOL;
|
|
|
+ sconst.bool_value = spc->default_value.int_bool_value != 0;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_SPECIALIZATION_CONSTANT_INT: {
|
|
|
+ sconst.type = RDC::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_INT;
|
|
|
+ sconst.int_value = spc->default_value.int_bool_value;
|
|
|
+ } break;
|
|
|
+ case SPV_REFLECT_SPECIALIZATION_CONSTANT_FLOAT: {
|
|
|
+ sconst.type = RDC::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_FLOAT;
|
|
|
+ sconst.float_value = spc->default_value.float_value;
|
|
|
+ } break;
|
|
|
+ }
|
|
|
+ sconst.stages.set_flag(stage_flag);
|
|
|
+
|
|
|
+ for (int k = 0; k < reflection.specialization_constants.size(); k++) {
|
|
|
+ if (reflection.specialization_constants[k].constant_id == sconst.constant_id) {
|
|
|
+ ERR_FAIL_COND_V_MSG(reflection.specialization_constants[k].type != sconst.type, FAILED, "More than one specialization constant used for id (" + itos(sconst.constant_id) + "), but their types differ.");
|
|
|
+ ERR_FAIL_COND_V_MSG(reflection.specialization_constants[k].int_value != sconst.int_value, FAILED, "More than one specialization constant used for id (" + itos(sconst.constant_id) + "), but their default values differ.");
|
|
|
+ existing = k;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (existing >= 0) {
|
|
|
+ reflection.specialization_constants.write[existing].stages.set_flag(stage_flag);
|
|
|
+ } else {
|
|
|
+ reflection.specialization_constants.push_back(sconst);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ reflection.specialization_constants.sort();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (stage == RDC::SHADER_STAGE_VERTEX || stage == RDC::SHADER_STAGE_FRAGMENT) {
|
|
|
+ uint32_t iv_count = 0;
|
|
|
+ result = spvReflectEnumerateInputVariables(&module, &iv_count, nullptr);
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed enumerating input variables.");
|
|
|
+
|
|
|
+ if (iv_count) {
|
|
|
+ Vector<SpvReflectInterfaceVariable *> input_vars;
|
|
|
+ input_vars.resize(iv_count);
|
|
|
+
|
|
|
+ result = spvReflectEnumerateInputVariables(&module, &iv_count, input_vars.ptrw());
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed obtaining input variables.");
|
|
|
+
|
|
|
+ for (const SpvReflectInterfaceVariable *v : input_vars) {
|
|
|
+ if (!v) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (stage == RDC::SHADER_STAGE_VERTEX) {
|
|
|
+ if (v->decoration_flags == 0) { // Regular input.
|
|
|
+ reflection.vertex_input_mask |= (((uint64_t)1) << v->location);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (v->built_in == SpvBuiltInViewIndex) {
|
|
|
+ reflection.has_multiview = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (stage == RDC::SHADER_STAGE_FRAGMENT) {
|
|
|
+ uint32_t ov_count = 0;
|
|
|
+ result = spvReflectEnumerateOutputVariables(&module, &ov_count, nullptr);
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed enumerating output variables.");
|
|
|
+
|
|
|
+ if (ov_count) {
|
|
|
+ Vector<SpvReflectInterfaceVariable *> output_vars;
|
|
|
+ output_vars.resize(ov_count);
|
|
|
+
|
|
|
+ result = spvReflectEnumerateOutputVariables(&module, &ov_count, output_vars.ptrw());
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed obtaining output variables.");
|
|
|
+
|
|
|
+ for (const SpvReflectInterfaceVariable *refvar : output_vars) {
|
|
|
+ if (!refvar) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (refvar->built_in != SpvBuiltInFragDepth) {
|
|
|
+ reflection.fragment_output_mask |= 1 << refvar->location;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ uint32_t pc_count = 0;
|
|
|
+ result = spvReflectEnumeratePushConstantBlocks(&module, &pc_count, nullptr);
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed enumerating push constants.");
|
|
|
+
|
|
|
+ if (pc_count) {
|
|
|
+ ERR_FAIL_COND_V_MSG(pc_count > 1, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "': Only one push constant is supported, which should be the same across shader stages.");
|
|
|
+
|
|
|
+ Vector<SpvReflectBlockVariable *> pconstants;
|
|
|
+ pconstants.resize(pc_count);
|
|
|
+ result = spvReflectEnumeratePushConstantBlocks(&module, &pc_count, pconstants.ptrw());
|
|
|
+ ERR_FAIL_COND_V_MSG(result != SPV_REFLECT_RESULT_SUCCESS, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "' failed obtaining push constants.");
|
|
|
+#if 0
|
|
|
+ if (pconstants[0] == nullptr) {
|
|
|
+ Ref<FileAccess> f = FileAccess::open("res://popo.spv", FileAccess::WRITE);
|
|
|
+ f->store_buffer((const uint8_t *)&SpirV[0], SpirV.size() * sizeof(uint32_t));
|
|
|
+ }
|
|
|
+#endif
|
|
|
+
|
|
|
+ ERR_FAIL_COND_V_MSG(reflection.push_constant_size && reflection.push_constant_size != pconstants[0]->size, FAILED,
|
|
|
+ "Reflection of SPIR-V shader stage '" + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + "': Push constant block must be the same across shader stages.");
|
|
|
+
|
|
|
+ reflection.push_constant_size = pconstants[0]->size;
|
|
|
+ reflection.push_constant_stages.set_flag(stage_flag);
|
|
|
+
|
|
|
+ //print_line("Stage: " + String(RDC::SHADER_STAGE_NAMES[stage]) + " push constant of size=" + itos(push_constant.push_constant_size));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ reflection.stages_bits.set_flag(stage_flag);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Sort all uniform_sets by binding.
|
|
|
+ for (uint32_t i = 0; i < reflection.uniform_sets.size(); i++) {
|
|
|
+ reflection.uniform_sets.write[i].sort();
|
|
|
+ }
|
|
|
+
|
|
|
+ set_from_shader_reflection(reflection);
|
|
|
+
|
|
|
+ return OK;
|
|
|
+}
|
|
|
+
|
|
|
+void RenderingShaderContainer::set_from_shader_reflection(const RenderingDeviceCommons::ShaderReflection &p_reflection) {
|
|
|
reflection_binding_set_uniforms_count.clear();
|
|
|
reflection_binding_set_uniforms_data.clear();
|
|
|
reflection_specialization_data.clear();
|
|
|
reflection_shader_stages.clear();
|
|
|
|
|
|
- shader_name = p_shader_name.utf8();
|
|
|
-
|
|
|
reflection_data.vertex_input_mask = p_reflection.vertex_input_mask;
|
|
|
reflection_data.fragment_output_mask = p_reflection.fragment_output_mask;
|
|
|
reflection_data.specialization_constants_count = p_reflection.specialization_constants.size();
|
|
|
@@ -156,11 +523,13 @@ void RenderingShaderContainer::set_from_shader_reflection(const String &p_shader
|
|
|
|
|
|
reflection_data.stage_count = reflection_shader_stages.size();
|
|
|
|
|
|
- _set_from_shader_reflection_post(p_shader_name, p_reflection);
|
|
|
+ _set_from_shader_reflection_post(p_reflection);
|
|
|
}
|
|
|
|
|
|
-bool RenderingShaderContainer::set_code_from_spirv(const Vector<RenderingDeviceCommons::ShaderStageSPIRVData> &p_spirv) {
|
|
|
- return _set_code_from_spirv(p_spirv);
|
|
|
+bool RenderingShaderContainer::set_code_from_spirv(const String &p_shader_name, Span<RenderingDeviceCommons::ShaderStageSPIRVData> p_spirv) {
|
|
|
+ LocalVector<ReflectedShaderStage> spirv;
|
|
|
+ ERR_FAIL_COND_V(reflect_spirv(p_shader_name, p_spirv, spirv) != OK, false);
|
|
|
+ return _set_code_from_spirv(spirv.span());
|
|
|
}
|
|
|
|
|
|
RenderingDeviceCommons::ShaderReflection RenderingShaderContainer::get_shader_reflection() const {
|
Stuart Carnie