Mesa (master): llvmpipe: add DEBUG_FS to dump variant information

[Keith Whitwell]

Module: Mesa
Branch: master
Commit: 09863554259aeb7b0522b130837b6a1f12ffaebe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09863554259aeb7b0522b130837b6a1f12ffaebe

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Sep 16 15:16:27 2010 +0100

llvmpipe: add DEBUG_FS to dump variant information

---

 src/gallium/drivers/llvmpipe/lp_debug.h    |    1 +
 src/gallium/drivers/llvmpipe/lp_screen.c   |    1 +
 src/gallium/drivers/llvmpipe/lp_state_fs.c |    2 +-
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_debug.h b/src/gallium/drivers/llvmpipe/lp_debug.h
index 588cda5..15dca52 100644
--- a/src/gallium/drivers/llvmpipe/lp_debug.h
+++ b/src/gallium/drivers/llvmpipe/lp_debug.h
@@ -49,6 +49,7 @@ st_print_current(void);
 #define DEBUG_SCENE         0x1000
 #define DEBUG_FENCE         0x2000
 #define DEBUG_MEM           0x4000
+#define DEBUG_FS            0x8000
 
 /* Performance flags.  These are active even on release builds.
  */
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index f920607..c66313f 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -64,6 +64,7 @@ static const struct debug_named_value lp_debug_flags[] = {
    { "scene", DEBUG_SCENE, NULL },
    { "fence", DEBUG_FENCE, NULL },
    { "mem", DEBUG_MEM, NULL },
+   { "fs", DEBUG_FS, NULL },
    DEBUG_NAMED_VALUE_END
 };
 #endif
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 8101e2d..e54dd9f 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -865,7 +865,7 @@ generate_variant(struct llvmpipe_context *lp,
          ? TRUE : FALSE;
 
 
-   if (gallivm_debug & GALLIVM_DEBUG_IR) {
+   if ((LP_DEBUG & DEBUG_FS) || (gallivm_debug & GALLIVM_DEBUG_IR)) {
       lp_debug_fs_variant(variant);
    }