2 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/main/texturebarrier.c b/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 <[email protected]>
  */
 
 #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
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 <[email protected]>
  */
 
-#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 */