diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-12 16:28:12 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-12 16:28:12 +0100 |
| commit | 61282068f4d59cb48f35ad95391728c58d9008ab (patch) | |
| tree | f26b429f84125f177f141596443e3e1d36a520d6 | |
| parent | 20373d026dfd3153ad5541ebd1873ad918db2f41 (diff) | |
| parent | 49625beac257e868a30a3d7b41665f7d1419b2c0 (diff) | |
| download | redot-engine-61282068f4d59cb48f35ad95391728c58d9008ab.tar.gz | |
Merge pull request #89420 from RandomShaper/sort_scs
Ensure specialization constants come sorted from reflection
| -rw-r--r-- | servers/rendering/rendering_device_commons.h | 2 | ||||
| -rw-r--r-- | servers/rendering/rendering_device_driver.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/servers/rendering/rendering_device_commons.h b/servers/rendering/rendering_device_commons.h index 591752bc0e..28d641c879 100644 --- a/servers/rendering/rendering_device_commons.h +++ b/servers/rendering/rendering_device_commons.h @@ -912,6 +912,8 @@ public: struct ShaderSpecializationConstant : public PipelineSpecializationConstant { BitField<ShaderStage> stages; + + bool operator<(const ShaderSpecializationConstant &p_other) const { return constant_id < p_other.constant_id; } }; struct ShaderDescription { diff --git a/servers/rendering/rendering_device_driver.cpp b/servers/rendering/rendering_device_driver.cpp index 9e05a6a133..be74467340 100644 --- a/servers/rendering/rendering_device_driver.cpp +++ b/servers/rendering/rendering_device_driver.cpp @@ -265,6 +265,8 @@ Error RenderingDeviceDriver::_reflect_spirv(VectorView<ShaderStageSPIRVData> p_s r_reflection.specialization_constants.push_back(sconst); } } + + r_reflection.specialization_constants.sort(); } } |