From: Brian Date: Mon, 5 Nov 2007 20:18:47 +0000 (-0700) Subject: remove some GL types, mesa includes X-Git-Tag: 062012170305~17580^2~390^2~3427 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4bad270998e0b97bd97e8e38b08826ed45e2f5e;p=profile%2Fivi%2Fmesa.git remove some GL types, mesa includes --- diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c index b7bfc39..2a29c2a 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 5aa07d4..15d849d 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 74a7a55..65d3eb3 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 87a6cb2..1d24ff7 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 fca006b..7ae5fd1 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);