From 75539eac3e8f8a551fe68c212e00e2b2dc4e3095 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 8 Jan 2025 08:17:49 -0500
Subject: [PATCH] glsl: enable OVR_multiview if OVR_multiview2 is enabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

according to spec

Fixes: 328c29d6007 ("mesa,glsl,gallium: add GL_OVR_multiview")

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
(cherry picked from commit 010732b8efa5c897a3d7eeff3a84bc90a6f47eb6)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33113>
---
 .pick_status.json                        | 2 +-
 src/compiler/glsl/glsl_parser_extras.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index d7f69fc56e8..ea198921b00 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1024,7 +1024,7 @@
         "description": "glsl: enable OVR_multiview if OVR_multiview2 is enabled",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "328c29d6007ed7677d5c5307bd6997d84a32104a",
         "notes": null
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index 70383ce9aa1..2cd0b3d841e 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -1031,6 +1031,9 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
       }
    }
 
+   if (state->OVR_multiview2_enable)
+      state->OVR_multiview_enable = true;
+
    return true;
 }