Mesa (master): r300g: Fix macro
Marek Olšák
mareko at kemper.freedesktop.org
Mon Aug 16 03:01:54 UTC 2010
Module: Mesa
Branch: master
Commit: b0e1565b5f24c3f624745890170cce0700e620ff
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0e1565b5f24c3f624745890170cce0700e620ff
Author: nobled <nobled at dreamwidth.org>
Date: Sun Aug 15 02:50:04 2010 +0000
r300g: Fix macro
This fixes a potential bug if (has_hyperz) is false
(it would still init the atom as if has_hyperz were true).
Signed-off-by: Marek Olšák <maraeo at gmail.com>
---
src/gallium/drivers/r300/r300_context.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index e8b6c4f..23b654e 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -158,12 +158,14 @@ void r300_flush_cb(void *data)
}
#define R300_INIT_ATOM(atomname, atomsize) \
+ do { \
r300->atomname.name = #atomname; \
r300->atomname.state = NULL; \
r300->atomname.size = atomsize; \
r300->atomname.emit = r300_emit_##atomname; \
r300->atomname.dirty = FALSE; \
- insert_at_tail(&r300->atom_list, &r300->atomname);
+ insert_at_tail(&r300->atom_list, &r300->atomname); \
+ } while (0)
static void r300_setup_atoms(struct r300_context* r300)
{
More information about the mesa-commit
mailing list