Merge pull request #82445 from RandomShaper/fix_fsr2_little_thing

Avoid trying to free null RIDs in FSR2 teardown
godotengine · Sep 27, 2023 · 3c8465c · 3c8465c
2 parents 46e48c5 + f84c3d4
commit 3c8465c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/servers/rendering/renderer_rd/effects/fsr2.cpp b/servers/rendering/renderer_rd/effects/fsr2.cpp
@@ -804,7 +804,9 @@ FSR2Effect::~FSR2Effect() {
  RD::get_singleton()->free(device.linear_clamp_sampler);
 
  for (uint32_t i = 0; i < FFX_FSR2_PASS_COUNT; i++) {
- RD::get_singleton()->free(device.passes[i].pipeline.pipeline_rid);
+ if (device.passes[i].pipeline.pipeline_rid.is_valid()) {
+ RD::get_singleton()->free(device.passes[i].pipeline.pipeline_rid);
+ }
  device.passes[i].shader->version_free(device.passes[i].shader_version);
  }
 }