Module: Mesa
Branch: master
Commit: af57378e599c00711bf1109fb84e6032668ecaa4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=af57378e599c00711bf1109fb84e6032668ecaa4
Author: Chia-I Wu <olva...@gmail.com>
Date: Fri Jan 10 13:50:52 2014 +0800
ilo: simplify ilo_texture_set_slice_flags()
Call ilo_texture_get_slice() for the last slice so that we can get rid of the
duplicated assert().
---
src/gallium/drivers/ilo/ilo_resource.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/ilo/ilo_resource.h
b/src/gallium/drivers/ilo/ilo_resource.h
index 124581a..afb49ff 100644
--- a/src/gallium/drivers/ilo/ilo_resource.h
+++ b/src/gallium/drivers/ilo/ilo_resource.h
@@ -146,14 +146,12 @@ ilo_texture_set_slice_flags(struct ilo_texture *tex,
unsigned level,
unsigned first_slice, unsigned num_slices,
unsigned mask, unsigned value)
{
+ const struct ilo_texture_slice *last =
+ ilo_texture_get_slice(tex, level, first_slice + num_slices - 1);
struct ilo_texture_slice *slice =
ilo_texture_get_slice(tex, level, first_slice);
- assert(first_slice + num_slices - 1 <
- ((tex->base.target == PIPE_TEXTURE_3D) ?
- u_minify(tex->base.depth0, level) : tex->base.array_size));
-
- while (num_slices--) {
+ while (slice <= last) {
slice->flags = (slice->flags & ~mask) | (value & mask);
slice++;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
