summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-11-05 13:18:47 -0700
committerBrian <brian.paul@tungstengraphics.com>2007-11-05 13:18:47 -0700
commite4bad270998e0b97bd97e8e38b08826ed45e2f5e (patch)
tree2368eb85b7b576eff4ed68687280e4485227ab97 /src/mesa/drivers/dri
parent3f80be3cb5dcd1378316c0330446a72a2095d9ca (diff)
remove some GL types, mesa includes
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.h9
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_lock.c2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_screen.h2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h3
5 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index b7bfc39f89..2a29c2ab27 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -35,7 +35,7 @@
#include "intel_batchbuffer.h"
#include "state_tracker/st_public.h"
-#include "state_tracker/st_context.h"
+#include "state_tracker/st_context.h" /* XXX temporary */
#include "pipe/p_defines.h"
#include "pipe/p_context.h"
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 5aa07d4ed1..15d849d52b 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -29,10 +29,7 @@
#define INTELCONTEXT_INC
-
-#include "mtypes.h"
#include "drm.h"
-
#include "intel_screen.h"
#include "i915_drm.h"
@@ -58,11 +55,11 @@ struct intel_context
struct intel_batchbuffer *batch;
- GLboolean locked;
+ boolean locked;
char *prevLockFile;
int prevLockLine;
- GLuint irqsEmitted;
+ uint irqsEmitted;
drm_i915_irq_wait_t iw;
drm_context_t hHWContext;
@@ -74,7 +71,7 @@ struct intel_context
struct intel_screen *intelScreen;
drmI830Sarea *sarea;
- GLuint lastStamp;
+ uint lastStamp;
/**
* Configuration cache
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
index 74a7a55bd0..65d3eb3b3a 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_lock.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
@@ -41,7 +41,7 @@ _glthread_DECLARE_STATIC_MUTEX( lockMutex );
static void
-intelContendedLock(struct intel_context *intel, GLuint flags)
+intelContendedLock(struct intel_context *intel, uint flags)
{
__DRIdrawablePrivate *dPriv = intel->driDrawable;
__DRIscreenPrivate *sPriv = intel->driScreen;
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.h b/src/mesa/drivers/dri/intel_winsys/intel_screen.h
index 87a6cb21d1..1d24ff7ff7 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.h
@@ -67,7 +67,7 @@ struct intel_screen
struct _DriBufferPool *batchPool;
struct _DriBufferPool *regionPool;
struct _DriBufferPool *staticPool; /** for the X screen/framebuffer */
- GLboolean havePools;
+ boolean havePools;
struct intel_context *dummyctxptr;
};
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
index fca006b767..7ae5fd15a5 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
@@ -29,6 +29,9 @@
#define INTEL_SWAPBUFFERS_H
+struct pipe_surface;
+
+
extern void intelDisplaySurface(__DRIdrawablePrivate * dPriv,
struct pipe_surface *surf,
const drm_clip_rect_t * rect);