disassemble pixel shader packets

1 files changed, 18 insertions, 9 deletions

diff --git a/src/mesa/drivers/dri/i915tex/i915_vtbl.c b/src/mesa/drivers/dri/i915tex/i915_vtbl.c
index aff49e22b4..dfd1bbe936 100644
--- a/src/mesa/drivers/dri/i915tex/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915tex/i915_vtbl.c
@@ -44,21 +44,30 @@
 #include "i915_context.h"
 #include "i915_cache.h"
 
-static GLuint debug( const int *stream, 
-		     const char *name,
-		     GLuint len )
+static GLuint debug( const int *stream, const char *name, GLuint len )
 {
    GLuint i;
 
-   switch (len) {
-   case 0:
+   if (len == 0) 
       _mesa_printf("Error - zero length packet (0x%08x)\n", stream[0]);
-      break;
-   default:
+   else
       _mesa_printf("%s (%d dwords):\n", name, len);
-      break;
+
+   return len;
+}
+
+static GLuint debug_program( const int *stream, const char *name, GLuint len )
+{
+   GLuint i;
+
+   if (len == 0) {
+      _mesa_printf("Error - zero length packet (0x%08x)\n", stream[0]);
+      return 0;
    }
 
+   _mesa_printf("%s (%d dwords):\n", name, len);
+   i915_disassemble_program( stream, len );
+
    return len;
 }
 
@@ -130,7 +139,7 @@ static GLuint i915_debug_packet(const GLuint *stream)
 	 case 0x4:
 	    return debug(stream, "3DSTATE_LOAD_STATE_IMMEDIATE", (cmd & 0xf) + 2);
 	 case 0x5:
-	    return debug(stream, "3DSTATE_PIXEL_SHADER_PROGRAM", (cmd & 0x1ff) + 2);
+	    return debug_program(stream, "3DSTATE_PIXEL_SHADER_PROGRAM", (cmd & 0x1ff) + 2);
 	 case 0x6:
 	    return debug(stream, "3DSTATE_PIXEL_SHADER_CONSTANTS", (cmd & 0xff) + 2);
 	 case 0x7: