From 91c2216165e87c7dee665808ac175b186c7c5c9b Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sat, 11 Aug 2007 14:19:48 +0100
Subject: [PATCH] Rename intel_buffers.[ch] to intel_swapbuffers.[ch]

---
 src/mesa/drivers/dri/intel_winsys/Makefile             |  2 +-
 src/mesa/drivers/dri/intel_winsys/intel_context.c      | 10 +---------
 src/mesa/drivers/dri/intel_winsys/intel_lock.c         |  2 +-
 src/mesa/drivers/dri/intel_winsys/intel_screen.c       |  2 +-
 .../{intel_buffers.c => intel_swapbuffers.c}           |  2 +-
 .../{intel_buffers.h => intel_swapbuffers.h}           |  0
 src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c  |  2 +-
 7 files changed, 6 insertions(+), 14 deletions(-)
 rename src/mesa/drivers/dri/intel_winsys/{intel_buffers.c => intel_swapbuffers.c} (99%)
 rename src/mesa/drivers/dri/intel_winsys/{intel_buffers.h => intel_swapbuffers.h} (100%)

diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/mesa/drivers/dri/intel_winsys/Makefile
index 7c37812172b..46b9541d7d4 100644
--- a/src/mesa/drivers/dri/intel_winsys/Makefile
+++ b/src/mesa/drivers/dri/intel_winsys/Makefile
@@ -15,7 +15,7 @@ DRIVER_SOURCES = \
 	intel_winsys_softpipe.c \
 	intel_winsys_i915.c \
 	intel_batchbuffer.c \
-	intel_buffers.c \
+	intel_swapbuffers.c \
 	intel_context.c \
 	intel_lock.c \
 	intel_screen.c \
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 435d17421cf..71bc5003d26 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -40,7 +40,7 @@
 
 #include "intel_screen.h"
 #include "intel_context.h"
-#include "intel_buffers.h"
+#include "intel_swapbuffers.h"
 #include "intel_winsys.h"
 #include "intel_batchbuffer.h"
 
@@ -82,9 +82,6 @@ int __intel_debug = 0;
 
 #define DRIVER_DATE                     "20070731"
 
-_glthread_Mutex lockMutex;
-static GLboolean lockMutexInit = GL_FALSE;
-
 
 
 /**
@@ -222,11 +219,6 @@ intelCreateContext(const __GLcontextModes * mesaVis,
    intel->driScreen = sPriv;
    intel->sarea = saPriv;
 
-   if (!lockMutexInit) {
-      lockMutexInit = GL_TRUE;
-      _glthread_INIT_MUTEX(lockMutex);
-   }
-
    driParseConfigFiles(&intel->optionCache, &intelScreen->optionCache,
                        intel->driScreen->myNum, "i915");
 
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
index e9e4bc06455..38f0a4e2d7c 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_lock.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
@@ -33,7 +33,7 @@
 #include "intel_screen.h"
 #include "intel_context.h"
 #include "intel_batchbuffer.h"
-#include "intel_buffers.h"
+#include "intel_swapbuffers.h"
 
 #include "i830_dri.h"
 
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
index cf8d190d344..e6bd87a4ea6 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
@@ -37,7 +37,7 @@
 
 #include "intel_screen.h"
 #include "intel_batchbuffer.h"
-#include "intel_buffers.h"
+#include "intel_swapbuffers.h"
 
 #include "i830_dri.h"
 #include "dri_bufpool.h"
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_buffers.c b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
similarity index 99%
rename from src/mesa/drivers/dri/intel_winsys/intel_buffers.c
rename to src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
index 0823c5c8eaf..56d220ab9ec 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
@@ -27,7 +27,7 @@
 
 #include "intel_screen.h"
 #include "intel_context.h"
-#include "intel_buffers.h"
+#include "intel_swapbuffers.h"
 #include "intel_batchbuffer.h"
 #include "intel_reg.h"
 #include "context.h"
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_buffers.h b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_buffers.h
rename to src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
index bedc7d14ab1..33aacf2a431 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
@@ -36,7 +36,7 @@
 
 #include "intel_context.h"
 #include "intel_winsys.h"
-#include "intel_buffers.h"
+#include "intel_swapbuffers.h"
 #include "intel_batchbuffer.h"
 
 #include "pipe/p_winsys.h"
-- 
2.30.2