summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Forbes <[email protected]>2014-01-21 22:48:30 +1300
committerChris Forbes <[email protected]>2014-04-10 18:27:41 +1200
commit93fa16bdd13e67bc3a824bf3408f207c4ff0e894 (patch)
tree5309e61f193d14f4fee47f7f0f4b3675c485989d
parenta98b675945bc7920ab7d2bbbf0b9641693a8de5d (diff)
i965: Ensure that texture validation is skipped for immutable textures.
If we were to relayout the miptree, we'd break any views that are sharing it. (Simplified based on suggestions from Eric) Signed-off-by: Chris Forbes <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Acked-by: Eric Anholt <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/intel_tex_validate.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c
index d8497a681e3..48a41584cef 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c
@@ -98,6 +98,11 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
return true;
}
+ /* Immutable textures should not get this far -- they should have been
+ * created in a validated state, and nothing can invalidate them.
+ */
+ assert(!tObj->Immutable);
+
firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]);
/* Check tree can hold all active levels. Check tree matches