llvmpipe: add DEBUG_FS to dump variant information

diff --git a/src/gallium/drivers/llvmpipe/lp_debug.h b/src/gallium/drivers/llvmpipe/lp_debug.h
index 588cda52ad040df9011b0df346c29321439e0540..15dca5218fdd99d8758261bba272ea779b7a6b78 100644 (file)
--- 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 f920607d05320281915a5f79183b2d4c3e64b696..c66313f0ed847d9b6f61a1a4b5f7419099b3f109 100644 (file)
--- 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 8101e2d843dff7233fb491991801855a00f3e776..e54dd9f0a3c91560a65551090d22efb37d82a43b 100644 (file)
--- 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);
    }