mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 07:28:11 +02:00
remove some GL types, mesa includes
This commit is contained in:
parent
3f80be3cb5
commit
e4bad27099
5 changed files with 9 additions and 9 deletions
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue