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/i915_metaops.c | |
| 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/i915_metaops.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/i915_metaops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915tex/i915_metaops.c b/src/mesa/drivers/dri/i915tex/i915_metaops.c index 397ff75b6f..a739bd6581 100644 --- a/src/mesa/drivers/dri/i915tex/i915_metaops.c +++ b/src/mesa/drivers/dri/i915tex/i915_metaops.c @@ -326,7 +326,7 @@ meta_texture_blend_replace(struct intel_context *intel) */ static GLboolean meta_tex_rect_source(struct intel_context *intel, - struct _DriBufferObject *buffer, + dri_bo *buffer, GLuint offset, GLuint pitch, GLuint height, GLenum format, GLenum type) { |