summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-11-05 13:37:12 -0700
committerBrian <brian.paul@tungstengraphics.com>2007-11-05 13:37:12 -0700
commitf4d51d8923db9fd71e5f9fe965769625bd0d1240 (patch)
tree0b7157341ad2568ef0368af5649268cceeac4875
parente4bad270998e0b97bd97e8e38b08826ed45e2f5e (diff)
asst clean-ups
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c1
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.h4
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_lock.c8
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_screen.c10
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_winsys.h4
5 files changed, 9 insertions, 18 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 2a29c2ab27..607d316e36 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -40,7 +40,6 @@
#include "pipe/p_context.h"
#include "utils.h"
-#include "xmlpool.h" /* for symbolic values of enum-type options */
#ifdef DEBUG
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 15d849d52b..eac5cd8b4c 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -25,8 +25,8 @@
*
**************************************************************************/
-#ifndef INTELCONTEXT_INC
-#define INTELCONTEXT_INC
+#ifndef INTEL_CONTEXT_H
+#define INTEL_CONTEXT_H
#include "drm.h"
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
index 65d3eb3b3a..55606dba8b 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_lock.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
@@ -27,12 +27,7 @@
#include "state_tracker/st_public.h"
-
-#include "intel_screen.h"
#include "intel_context.h"
-#include "intel_batchbuffer.h"
-#include "intel_swapbuffers.h"
-
#include "i830_dri.h"
@@ -73,13 +68,10 @@ intelContendedLock(struct intel_context *intel, uint flags)
void LOCK_HARDWARE( struct intel_context *intel )
{
char __ret=0;
- int curbuf;
_glthread_LOCK_MUTEX(lockMutex);
assert(!intel->locked);
- curbuf = 0; /* current draw buf: 0 = front, 1 = back */
-
DRM_CAS(intel->driHwLock, intel->hHWContext,
(DRM_LOCK_HELD|intel->hHWContext), __ret);
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
index c14e84ebd6..fa5c19ecd7 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
@@ -52,14 +52,14 @@ PUBLIC const char __driConfigOptions[] =
DRI_CONF_FORCE_S3TC_ENABLE(false)
DRI_CONF_ALLOW_LARGE_TEXTURES(1)
DRI_CONF_SECTION_END DRI_CONF_END;
- const GLuint __driNConfigOptions = 4;
+
+const GLuint __driNConfigOptions = 4;
#ifdef USE_NEW_INTERFACE
- static PFNGLXCREATECONTEXTMODES create_context_modes = NULL;
+static PFNGLXCREATECONTEXTMODES create_context_modes = NULL;
#endif /*USE_NEW_INTERFACE */
- extern const struct dri_extension card_extensions[];
-
+extern const struct dri_extension card_extensions[];
@@ -255,7 +255,7 @@ intelDestroyScreen(__DRIscreenPrivate * sPriv)
{
struct intel_screen *intelScreen = intel_screen(sPriv);
-// intelUnmapScreenRegions(intelScreen);
+ /* intelUnmapScreenRegions(intelScreen); */
if (intelScreen->havePools) {
driPoolTakeDown(intelScreen->regionPool);
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys.h b/src/mesa/drivers/dri/intel_winsys/intel_winsys.h
index 2c8aa20c2a..78f5cb6519 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys.h
@@ -25,8 +25,8 @@
*
**************************************************************************/
-#ifndef INTEL_PIPE_H
-#define INTEL_PIPE_H
+#ifndef INTEL_WINSYS_H
+#define INTEL_WINSYS_H
struct intel_context;
struct pipe_context;