From 12b1feb03e222178b314a06f20ba981486b1ec84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Sun, 28 Nov 2021 17:24:59 -0500
Subject: [PATCH] mesa: don't set CallList* redundantly in
 _mesa_initialize_save_table

It's set by _mesa_install_save_vtxfmt.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14000>
---
 src/mapi/glapi/gen/gl_API.xml | 4 ++--
 src/mesa/main/dlist.c         | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index a334ec61df3..4533a2805f6 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -1122,12 +1122,12 @@
         <glx sop="102"/>
     </function>
 
-    <function name="CallList" deprecated="3.1" marshal="custom">
+    <function name="CallList" deprecated="3.1" marshal="custom" exec="vtxfmt">
         <param name="list" type="GLuint"/>
         <glx rop="1"/>
     </function>
 
-    <function name="CallLists" deprecated="3.1"
+    <function name="CallLists" deprecated="3.1" exec="vtxfmt"
               marshal_call_after="_mesa_glthread_CallLists(ctx, n, type, lists);">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="type" type="GLenum"/>
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 5965d5bd393..60c7b0adb8a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -14013,8 +14013,6 @@ _mesa_initialize_save_table(const struct gl_context *ctx)
    SET_AlphaFunc(table, save_AlphaFunc);
    SET_Bitmap(table, save_Bitmap);
    SET_BlendFunc(table, save_BlendFunc);
-   SET_CallList(table, save_CallList);
-   SET_CallLists(table, save_CallLists);
    SET_Clear(table, save_Clear);
    SET_ClearAccum(table, save_ClearAccum);
    SET_ClearColor(table, save_ClearColor);