From 83d2f9db2929781d7d4b182355c872a7cbbcaeec Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 5 Jul 2016 23:15:01 -0700
Subject: [PATCH] mesa: Rename "texturebarrier" source files to "barrier".

In preparation for collecting all pipeline barrier GL entry points
into a single source file.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/mapi/glapi/gen/gl_genexec.py              |  2 +-
 src/mesa/Makefile.sources                     |  4 ++--
 src/mesa/drivers/common/driverfuncs.c         |  4 ++--
 src/mesa/main/{texturebarrier.c => barrier.c} |  8 ++++----
 src/mesa/main/{texturebarrier.h => barrier.h} | 12 ++++++------
 5 files changed, 15 insertions(+), 15 deletions(-)
 rename src/mesa/main/{texturebarrier.c => barrier.c} (90%)
 rename src/mesa/main/{texturebarrier.h => barrier.h} (86%)

diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index 72d7b6fea1f..85e79900988 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -111,7 +111,7 @@ header = """/**
 #include "main/texparam.h"
 #include "main/texstate.h"
 #include "main/texstorage.h"
-#include "main/texturebarrier.h"
+#include "main/barrier.h"
 #include "main/textureview.h"
 #include "main/transformfeedback.h"
 #include "main/mtypes.h"
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 472e767d844..36227603652 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -24,6 +24,8 @@ MAIN_FILES = \
 	main/atifragshader.h \
 	main/attrib.c \
 	main/attrib.h \
+	main/barrier.c \
+	main/barrier.h \
 	main/blend.c \
 	main/blend.h \
 	main/blit.c \
@@ -230,8 +232,6 @@ MAIN_FILES = \
 	main/texstore.h \
 	main/textureview.c \
 	main/textureview.h \
-	main/texturebarrier.c \
-	main/texturebarrier.h \
 	main/transformfeedback.c \
 	main/transformfeedback.h \
 	main/uniform_query.cpp \
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 2730b7b2f2a..6069138e35d 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -47,7 +47,7 @@
 #include "main/fbobject.h"
 #include "main/samplerobj.h"
 #include "main/syncobj.h"
-#include "main/texturebarrier.h"
+#include "main/barrier.h"
 #include "main/transformfeedback.h"
 
 #include "program/program.h"
@@ -179,7 +179,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->BlitFramebuffer = _swrast_BlitFramebuffer;
    driver->DiscardFramebuffer = NULL;
 
-   _mesa_init_texture_barrier_functions(driver);
+   _mesa_init_barrier_functions(driver);
    _mesa_init_shader_object_functions(driver);
    _mesa_init_transform_feedback_functions(driver);
    _mesa_init_sampler_object_functions(driver);
diff --git a/src/mesa/main/texturebarrier.c b/src/mesa/main/barrier.c
similarity index 90%
rename from src/mesa/main/texturebarrier.c
rename to src/mesa/main/barrier.c
index d879eed57f2..beb48fb77b5 100644
--- a/src/mesa/main/texturebarrier.c
+++ b/src/mesa/main/barrier.c
@@ -22,14 +22,14 @@
  */
 
 /**
- * \file texturebarrier.c
- * Implementation of glTextureBarrierNV.
+ * \file barrier.c
+ * Implementation of various pipeline barrier entry points.
  *
  * \author Marek Olšák <maraeo@gmail.com>
  */
 
 #include "context.h"
-#include "texturebarrier.h"
+#include "barrier.h"
 
 
 static void
@@ -39,7 +39,7 @@ _mesa_texture_barrier(struct gl_context *ctx)
 }
 
 void
-_mesa_init_texture_barrier_functions(struct dd_function_table *driver)
+_mesa_init_barrier_functions(struct dd_function_table *driver)
 {
    driver->TextureBarrier = _mesa_texture_barrier;
 }
diff --git a/src/mesa/main/texturebarrier.h b/src/mesa/main/barrier.h
similarity index 86%
rename from src/mesa/main/texturebarrier.h
rename to src/mesa/main/barrier.h
index a84a85b2176..0652d14f3f0 100644
--- a/src/mesa/main/texturebarrier.h
+++ b/src/mesa/main/barrier.h
@@ -22,23 +22,23 @@
  */
 
 /**
- * \file texturebarrier.h
- * GL_NV_texture_barrier
+ * \file barrier.h
+ * GL_NV_texture_barrier and friends.
  *
  * \author Marek Olšák <maraeo@gmail.com>
  */
 
-#ifndef TEXTUREBARRIER_H
-#define TEXTUREBARRIER_H
+#ifndef BARRIER_H
+#define BARRIER_H
 
 #include "glheader.h"
 
 struct dd_function_table;
 
 extern void
-_mesa_init_texture_barrier_functions(struct dd_function_table *driver);
+_mesa_init_barrier_functions(struct dd_function_table *driver);
 
 extern void GLAPIENTRY
 _mesa_TextureBarrierNV(void);
 
-#endif /* TEXTUREBARRIER_H */
+#endif /* BARRIER_H */
-- 
2.30.2