Mesa (master): translate: Fix the fetch function assertions.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Tue Dec 4 19:35:25 UTC 2012
Module: Mesa
Branch: master
Commit: a416a4a91dd167f9f018932b0a1c7045bfc08bd8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a416a4a91dd167f9f018932b0a1c7045bfc08bd8
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed Nov 21 16:17:22 2012 +0000
translate: Fix the fetch function assertions.
fetch_rgba_float is NULL for integer formats, and vice-versa.
Reviewed-by: Brian Paul <brianp at vmware.com>
---
.../auxiliary/translate/translate_generic.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/gallium/auxiliary/translate/translate_generic.c b/src/gallium/auxiliary/translate/translate_generic.c
index 72099af..894c168 100644
--- a/src/gallium/auxiliary/translate/translate_generic.c
+++ b/src/gallium/auxiliary/translate/translate_generic.c
@@ -806,7 +806,6 @@ struct translate *translate_generic_create( const struct translate_key *key )
util_format_description(key->element[i].input_format);
assert(format_desc);
- assert(format_desc->fetch_rgba_float);
tg->attrib[i].type = key->element[i].type;
@@ -820,11 +819,14 @@ struct translate *translate_generic_create( const struct translate_key *key )
}
if (format_desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED) {
+ assert(format_desc->fetch_rgba_sint);
tg->attrib[i].fetch = (fetch_func)format_desc->fetch_rgba_sint;
} else {
+ assert(format_desc->fetch_rgba_uint);
tg->attrib[i].fetch = (fetch_func)format_desc->fetch_rgba_uint;
}
} else {
+ assert(format_desc->fetch_rgba_float);
tg->attrib[i].fetch = (fetch_func)format_desc->fetch_rgba_float;
}
More information about the mesa-commit
mailing list