Merge pull request #89420 from RandomShaper/sort_scs

Ensure specialization constants come sorted from reflection
godotengine · Mar 12, 2024 · 6128206 · 6128206
2 parents 20373d0 + 49625be
commit 6128206
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/servers/rendering/rendering_device_commons.h b/servers/rendering/rendering_device_commons.h
@@ -912,6 +912,8 @@ class RenderingDeviceCommons : public Object {
 
 	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
@@ -265,6 +265,8 @@ Error RenderingDeviceDriver::_reflect_spirv(VectorView<ShaderStageSPIRVData> p_s
 							r_reflection.specialization_constants.push_back(sconst);
 						}
 					}
+
+					r_reflection.specialization_constants.sort();
 				}
 			}
-Original file line number
+Diff line change
@@ Expand Up @@
     							r_reflection.specialization_constants.push_back(sconst);
     						}
     					}
+    					r_reflection.specialization_constants.sort();
     				}
     			}
@@ Expand Down @@