From 8a4114b9294c8e8f5bb977be47cc7764c9cdf490 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Fri, 6 Mar 2020 14:33:20 -0500
Subject: [PATCH 1/1] glthread: rename marshal.h/c to glthread_marshal.h and
 glthread_shaderobj.c

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4124>
---
 src/mapi/glapi/gen/gl_marshal.py                  |  4 +---
 src/mesa/Makefile.sources                         |  4 ++--
 src/mesa/main/glthread.c                          |  2 +-
 src/mesa/main/glthread_bufferobj.c                |  2 +-
 src/mesa/main/{marshal.h => glthread_marshal.h}   |  2 +-
 src/mesa/main/{marshal.c => glthread_shaderobj.c} | 10 +---------
 src/mesa/meson.build                              |  4 ++--
 7 files changed, 9 insertions(+), 19 deletions(-)
 rename src/mesa/main/{marshal.h => glthread_marshal.h} (99%)
 rename src/mesa/main/{marshal.c => glthread_shaderobj.c} (94%)

diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py
index d4bbcd44a48..da71a1de787 100644
--- a/src/mapi/glapi/gen/gl_marshal.py
+++ b/src/mapi/glapi/gen/gl_marshal.py
@@ -31,10 +31,8 @@ import sys
 
 header = """
 #include "api_exec.h"
-#include "context.h"
+#include "glthread_marshal.h"
 #include "dispatch.h"
-#include "glthread.h"
-#include "marshal.h"
 
 #define COMPAT (ctx->API != API_OPENGL_CORE)
 
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index d14c8d1a03d..6faf5d992b6 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -126,6 +126,8 @@ MAIN_FILES = \
 	main/glthread.c \
 	main/glthread.h \
 	main/glthread_bufferobj.c \
+	main/glthread_marshal.h \
+	main/glthread_shaderobj.c \
 	main/glthread_varray.c \
 	main/glheader.h \
 	main/hash.c \
@@ -143,8 +145,6 @@ MAIN_FILES = \
 	main/lines.c \
 	main/lines.h \
 	main/macros.h \
-	main/marshal.c \
-	main/marshal.h \
 	main/marshal_generated.c \
 	main/marshal_generated.h \
 	main/matrix.c \
diff --git a/src/mesa/main/glthread.c b/src/mesa/main/glthread.c
index c7466025086..92cac5ee401 100644
--- a/src/mesa/main/glthread.c
+++ b/src/mesa/main/glthread.c
@@ -34,7 +34,7 @@
 
 #include "main/mtypes.h"
 #include "main/glthread.h"
-#include "main/marshal.h"
+#include "main/glthread_marshal.h"
 #include "main/hash.h"
 #include "util/u_atomic.h"
 #include "util/u_thread.h"
diff --git a/src/mesa/main/glthread_bufferobj.c b/src/mesa/main/glthread_bufferobj.c
index c7bafc44220..b5df4569ac5 100644
--- a/src/mesa/main/glthread_bufferobj.c
+++ b/src/mesa/main/glthread_bufferobj.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "marshal.h"
+#include "glthread_marshal.h"
 #include "dispatch.h"
 
 /** Tracks the current bindings for the vertex array and index array buffers.
diff --git a/src/mesa/main/marshal.h b/src/mesa/main/glthread_marshal.h
similarity index 99%
rename from src/mesa/main/marshal.h
rename to src/mesa/main/glthread_marshal.h
index c5b3209201b..2b6d8f92389 100644
--- a/src/mesa/main/marshal.h
+++ b/src/mesa/main/glthread_marshal.h
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-/** \file marshal.h
+/** \file glthread_marshal.h
  *
  * Declarations of functions related to marshalling GL calls from a client
  * thread to a server thread.
diff --git a/src/mesa/main/marshal.c b/src/mesa/main/glthread_shaderobj.c
similarity index 94%
rename from src/mesa/main/marshal.c
rename to src/mesa/main/glthread_shaderobj.c
index a6610095783..535485699c9 100644
--- a/src/mesa/main/marshal.c
+++ b/src/mesa/main/glthread_shaderobj.c
@@ -21,15 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-/** \file marshal.c
- *
- * Custom functions for marshalling GL calls from the main thread to a worker
- * thread when automatic code generation isn't appropriate.
- */
-
-#include "main/enums.h"
-#include "main/macros.h"
-#include "marshal.h"
+#include "glthread_marshal.h"
 #include "dispatch.h"
 
 struct marshal_cmd_ShaderSource
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index a55ec73bfe3..5f906567518 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -168,6 +168,8 @@ files_libmesa_common = files(
   'main/glthread.c',
   'main/glthread.h',
   'main/glthread_bufferobj.c',
+  'main/glthread_marshal.h',
+  'main/glthread_shaderobj.c',
   'main/glthread_varray.c',
   'main/glheader.h',
   'main/hash.c',
@@ -185,8 +187,6 @@ files_libmesa_common = files(
   'main/lines.c',
   'main/lines.h',
   'main/macros.h',
-  'main/marshal.c',
-  'main/marshal.h',
   'main/matrix.c',
   'main/matrix.h',
   'main/mipmap.c',
-- 
2.30.2