diff options
| author | Eric Anholt <eric@anholt.net> | 2007-12-07 16:15:49 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-12-07 16:19:10 -0800 |
| commit | e3a6e60040b7f6ea7965e52f8f9881ed31e0347c (patch) | |
| tree | 6fadf576b904bb479936a355ed716ca305556848 /src/mesa/drivers/dri/i965/intel_tex_validate.c | |
| parent | 3ecdae82d751f9f404d10332f030e3280949ce4e (diff) | |
[965] Convert the driver to dri_bufmgr interface and enable TTM.
This is currently believed to work but be a significant performance loss.
Performance recovery should be soon to follow.
The dri_bo_fake_disable_backing_store() call was added to allow backing store
disable like bufmgr_fake.c did, which is a significant performance win (though
it's missing the no-fence-subdata part).
This commit is a squash merge of the 965-ttm branch, which had some history
I wanted to avoid pulling due to noisiness and brokenness at many points
for git-bisecting.
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_tex_validate.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_validate.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c index bd59c84dbd..4c8afd99da 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c @@ -31,7 +31,7 @@ #include "intel_context.h" #include "intel_mipmap_tree.h" #include "intel_tex.h" -#include "bufmgr.h" +#include "dri_bufmgr.h" /** * Compute which mipmap levels that really need to be sent to the hardware. @@ -116,11 +116,13 @@ static void intel_texture_invalidate( struct intel_texture_object *intelObj ) intelObj->dirty_images[face] = ~0; } +#if 0 static void intel_texture_invalidate_cb( struct intel_context *intel, void *ptr ) { intel_texture_invalidate( (struct intel_texture_object *) ptr ); } +#endif /* */ @@ -207,7 +209,7 @@ GLuint intel_finalize_mipmap_tree( struct intel_context *intel, firstImage->Depth, cpp, firstImage->IsCompressed); - +#if 0 /* Tell the buffer manager that we will manage the backing * store, but we still want it to do fencing for us. */ @@ -216,6 +218,7 @@ GLuint intel_finalize_mipmap_tree( struct intel_context *intel, intel_texture_invalidate_cb, intelObj, GL_FALSE); +#endif } /* Pull in any images not in the object's tree: |