diff options
author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-23 16:26:14 +0200 |
---|---|---|
committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-23 16:26:14 +0200 |
commit | a3dbd412df99c7d19b1f81b3b9ec7d5c8a09d069 (patch) | |
tree | baa0e115e726948268a60d5865897ab4e177ff79 /src/gallium/winsys/dri/intel/intel_screen.h | |
parent | e8d5be9c76b08ba423e3c635aae5178f2358169a (diff) | |
parent | a22462f6ef769129ee56223f1edc2cb851505da8 (diff) |
Merge branch 'gallium-i915-current' into gallium-0.1
Diffstat (limited to 'src/gallium/winsys/dri/intel/intel_screen.h')
-rw-r--r-- | src/gallium/winsys/dri/intel/intel_screen.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gallium/winsys/dri/intel/intel_screen.h b/src/gallium/winsys/dri/intel/intel_screen.h index 3396f9e564..c17f0202e4 100644 --- a/src/gallium/winsys/dri/intel/intel_screen.h +++ b/src/gallium/winsys/dri/intel/intel_screen.h @@ -31,7 +31,7 @@ #include "dri_util.h" #include "i830_common.h" #include "xmlconfig.h" -#include "dri_bufpool.h" +#include "ws_dri_bufpool.h" #include "pipe/p_compiler.h" @@ -74,6 +74,13 @@ struct intel_screen */ struct intel_context *dummyContext; + /* + * New stuff form the i915tex integration + */ + struct _DriFenceMgr *mgr; + struct _DriFreeSlabManager *fMan; + unsigned batch_id; + struct pipe_winsys *winsys; }; |