diff options
author | Eric Anholt <eric@anholt.net> | 2007-09-21 17:05:34 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2007-09-21 17:13:20 -0700 |
commit | 39c709c0f6a9b2c910265390b31ce233a991ab68 (patch) | |
tree | a4484723b11f36f822e3bfeeeaa3652da2753859 /src/mesa/drivers/dri/i915tex/server/i830_common.h | |
parent | 6016de689fb9f29fe148b5ff0daf0b34a8510e23 (diff) | |
parent | d0350dadaa52064f67e4e9001145af14478b2849 (diff) |
Merge branch 'i915-unification'
This branch replaces the DRM pool interface used by i915tex with a "dri_bufmgr"
interface in dri/common which may be set up to use either TTM or traditional
static memory management according to what is available. The i915tex TTM
code now requires an updated DDX which provides proper buffer objects for the
static front/back/depth, instead of using fake buffers. The driver is now
built as i915_dri.so, and should replace the old i915 driver shortly.
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/server/i830_common.h')
-rw-r--r-- | src/mesa/drivers/dri/i915tex/server/i830_common.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915tex/server/i830_common.h b/src/mesa/drivers/dri/i915tex/server/i830_common.h index 8735f93d14..a877f3c2f4 100644 --- a/src/mesa/drivers/dri/i915tex/server/i830_common.h +++ b/src/mesa/drivers/dri/i915tex/server/i830_common.h @@ -85,6 +85,7 @@ typedef struct { int last_enqueue; /* last time a buffer was enqueued */ int last_dispatch; /* age of the most recently dispatched buffer */ int ctxOwner; /* last context to upload state */ + /** Last context that used the buffer manager. */ int texAge; int pf_enabled; /* is pageflipping allowed? */ int pf_active; @@ -135,6 +136,15 @@ typedef struct { int third_offset; int third_size; unsigned int third_tiled; + + /* buffer object handles for the static buffers. May change + * over the lifetime of the client, though it doesn't in our current + * implementation. + */ + unsigned int front_bo_handle; + unsigned int back_bo_handle; + unsigned int third_bo_handle; + unsigned int depth_bo_handle; } drmI830Sarea; /* Flags for perf_boxes |