From 04ded2041c71d261730e8061a906e5aacf4229c4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 8 Oct 2025 09:13:58 -0400 Subject: [PATCH] glsl: fix gl_ViewID_OVR type to uint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the spec defines this as a uint, and having it as an int breaks anyone trying to actually use it cc: mesa-stable Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 8f0ac427b350cc799b2aa8c0c086f307cafe1cdc) --- .pick_status.json | 2 +- src/compiler/glsl/builtin_variables.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ced503b6ed5..cfdfcf6034a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3764,7 +3764,7 @@ "description": "glsl: fix gl_ViewID_OVR type to uint", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index 2ee428bdd66..4632a5a57a9 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -1131,7 +1131,7 @@ builtin_variable_generator::generate_special_vars() add_system_value(SYSTEM_VALUE_SUBGROUP_LT_MASK, uvec4_t, "gl_SubgroupLtMask"); } if (state->is_version(130, 300) && state->OVR_multiview_enable) { - add_system_value(SYSTEM_VALUE_VIEW_INDEX, int_t, GLSL_PRECISION_MEDIUM, + add_system_value(SYSTEM_VALUE_VIEW_INDEX, uint_t, GLSL_PRECISION_MEDIUM, "gl_ViewID_OVR"); } }