summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2007-08-11 14:19:48 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2007-08-11 14:19:48 +0100
commit91c2216165e87c7dee665808ac175b186c7c5c9b (patch)
tree427aaa0033650084a19726f1e5b8842a1937287c
parent8c4409690d30b5fc5c048b90351c14522119fa9c (diff)
Rename intel_buffers.[ch] to intel_swapbuffers.[ch]
-rw-r--r--src/mesa/drivers/dri/intel_winsys/Makefile2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c10
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_lock.c2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_screen.c2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c (renamed from src/mesa/drivers/dri/intel_winsys/intel_buffers.c)2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h (renamed from src/mesa/drivers/dri/intel_winsys/intel_buffers.h)0
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c2
7 files changed, 6 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/mesa/drivers/dri/intel_winsys/Makefile
index 7c37812172..46b9541d7d 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 435d17421c..71bc5003d2 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 e9e4bc0645..38f0a4e2d7 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 cf8d190d34..e6bd87a4ea 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
index 0823c5c8ea..56d220ab9e 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
index d12b5ef96e..d12b5ef96e 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_buffers.h
+++ b/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 bedc7d14ab..33aacf2a43 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"