summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2013-04-11 10:08:56 -0700
committerEric Anholt <[email protected]>2013-04-12 16:32:12 -0700
commitaceba66795bb0da7f09d0af6d9b766e1e52ca9cc (patch)
tree2e44098258d620c0b2a65891d689503b6b2c76a0 /src/mesa/drivers/dri
parent331766b9a20bdde5e10adfb0443477e5c43a14dd (diff)
i965: Fix error path for MCS allocation.
Asserts don't stop execution in release builds, so we would continue on to use an uninitialized format value. Just take the failure path, which appears to continue up the call stack for a while. Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/intel/intel_mipmap_tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index d7908c11516..7da020103e2 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -976,7 +976,7 @@ intel_miptree_alloc_mcs(struct intel_context *intel,
break;
default:
assert(!"Unrecognized sample count in intel_miptree_alloc_mcs");
- break;
+ return false;
};
/* From the Ivy Bridge PRM, Vol4 Part1 p76, "MCS Base Address":