From 10f08c273385f9be9bfd2d7df18d01685ce8029d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Thu, 4 Jan 2024 18:58:44 -0500
Subject: [PATCH] mesa: inline _mesa_set_vao_immutable

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27525>
---
 src/mesa/main/arrayobj.c    | 9 ---------
 src/mesa/main/arrayobj.h    | 9 ---------
 src/mesa/vbo/vbo_save_api.c | 3 ++-
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 33fbed678ac..cb623024b8d 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -798,15 +798,6 @@ _mesa_update_vao_derived_arrays(struct gl_context *ctx,
 }
 
 
-void
-_mesa_set_vao_immutable(struct gl_context *ctx,
-                        struct gl_vertex_array_object *vao)
-{
-   _mesa_update_vao_derived_arrays(ctx, vao);
-   vao->SharedAndImmutable = true;
-}
-
-
 /**
  * Map buffer objects used in attribute arrays.
  */
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 3edb4252c91..87c86b5a148 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -91,15 +91,6 @@ extern void
 _mesa_update_vao_derived_arrays(struct gl_context *ctx,
                                 struct gl_vertex_array_object *vao);
 
-
-/**
- * Mark the vao as shared and immutable, do remaining updates.
- */
-extern void
-_mesa_set_vao_immutable(struct gl_context *ctx,
-                        struct gl_vertex_array_object *vao);
-
-
 extern void
 _mesa_vao_map_arrays(struct gl_context *ctx, struct gl_vertex_array_object *vao,
                      GLbitfield access);
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 9cbb79badb8..d013fac32f2 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -389,7 +389,8 @@ update_vao(struct gl_context *ctx,
    assert((vao_enabled & ~(*vao)->VertexAttribBufferMask) == 0);
 
    /* Finalize and freeze the VAO */
-   _mesa_set_vao_immutable(ctx, *vao);
+   _mesa_update_vao_derived_arrays(ctx, *vao);
+   (*vao)->SharedAndImmutable = true;
 }
 
 static void wrap_filled_vertex(struct gl_context *ctx);