diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-24 17:49:01 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-24 17:49:01 +0200 |
| commit | f99c7e97b70ecea21ef48140b5cd540b6d5a1df0 (patch) | |
| tree | 2d9cafed48e710db420c61a5d8f0e875468d13cc | |
| parent | 2542a07e703f8607432a734cfd94abc41c2dd649 (diff) | |
| parent | a660c592c9e460123b97d9b2285f7b531663c196 (diff) | |
| download | redot-engine-f99c7e97b70ecea21ef48140b5cd540b6d5a1df0.tar.gz | |
Merge pull request #93536 from BastiaanOlij/fix_make_vrs_ci
XR: Check for bad input in `make_vrs_texture`
| -rw-r--r-- | servers/xr/xr_vrs.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/servers/xr/xr_vrs.cpp b/servers/xr/xr_vrs.cpp index 9d1e2f2068..3e283a42f0 100644 --- a/servers/xr/xr_vrs.cpp +++ b/servers/xr/xr_vrs.cpp @@ -94,7 +94,14 @@ RID XRVRS::make_vrs_texture(const Size2 &p_target_size, const PackedVector2Array int32_t texel_width = RD::get_singleton()->limit_get(RD::LIMIT_VRS_TEXEL_WIDTH); int32_t texel_height = RD::get_singleton()->limit_get(RD::LIMIT_VRS_TEXEL_HEIGHT); + // Should return sensible data or graphics API does not support VRS. + ERR_FAIL_COND_V(texel_width < 1 || texel_height < 1, RID()); + Size2 vrs_size = Size2(0.5 + p_target_size.x / texel_width, 0.5 + p_target_size.y / texel_height).round(); + + // Make sure we have at least one pixel. + vrs_size = vrs_size.maxf(1.0); + float max_radius = 0.5 * MIN(vrs_size.x, vrs_size.y); // Maximum radius that fits inside of our image float min_radius = vrs_min_radius * max_radius / 100.0; // Minimum radius as a percentage of our size real_t outer_radius = MAX(1.0, (max_radius - min_radius) / vrs_strength); |