Module: Mesa
Branch: mesa_7_7_branch
Commit: 135d7e12991312d7aff637565fbe67f666e4e39f
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=135d7e12991312d7aff637565fbe67f666e4e39f

Author: José Fonseca <[email protected]>
Date:   Sun Nov 15 12:14:03 2009 -0800

svga: Handle comment tokens when dumping.

---

 src/gallium/drivers/svga/svgadump/svga_shader.h    |    6 ++++++
 .../drivers/svga/svgadump/svga_shader_dump.c       |    7 ++++++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/svga/svgadump/svga_shader.h 
b/src/gallium/drivers/svga/svgadump/svga_shader.h
index 2fc1796..9217af2 100644
--- a/src/gallium/drivers/svga/svgadump/svga_shader.h
+++ b/src/gallium/drivers/svga/svgadump/svga_shader.h
@@ -211,4 +211,10 @@ struct sh_trinaryop
    struct sh_srcreg src2;
 };
 
+struct sh_comment
+{
+   unsigned opcode:16;
+   unsigned size:16;
+};
+
 #endif /* ST_SHADER_SVGA_H */
diff --git a/src/gallium/drivers/svga/svgadump/svga_shader_dump.c 
b/src/gallium/drivers/svga/svgadump/svga_shader_dump.c
index 7718bdf..b0e7fdf 100644
--- a/src/gallium/drivers/svga/svgadump/svga_shader_dump.c
+++ b/src/gallium/drivers/svga/svgadump/svga_shader_dump.c
@@ -587,7 +587,12 @@ svga_shader_dump(
          break;
 
       case SVGA3DOP_COMMENT:
-         assert( 0 );
+         {
+            struct sh_comment comment = *(struct sh_comment *)assem;
+
+            /* Ignore comment contents. */
+            assem += sizeof(struct sh_comment) / sizeof(unsigned) + 
comment.size;
+         }
          break;
 
       case SVGA3DOP_RET:

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to