Mesa (master): draw: Fix assertion failure at fetch_emit_prepare

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Thu May 28 05:55:04 UTC 2009


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

Author: Mike Kaplinksiy <mike.kaplinskiy at gmail.com>
Date:   Thu May 28 01:20:37 2009 -0400

draw: Fix assertion failure at fetch_emit_prepare

---

 src/gallium/auxiliary/draw/draw_pt_fetch_emit.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c b/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c
index 6b7d02a..e7fe6b3 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c
@@ -130,6 +130,10 @@ static void fetch_emit_prepare( struct draw_pt_middle_end *middle,
       unsigned output_format;
 
       switch (vinfo->attrib[i].emit) {
+      case EMIT_4UB:
+	 output_format = PIPE_FORMAT_R8G8B8A8_UNORM;
+	 emit_sz = 4 * sizeof(unsigned char);
+         break;
       case EMIT_4F:
 	 output_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
 	 emit_sz = 4 * sizeof(float);
@@ -153,6 +157,8 @@ static void fetch_emit_prepare( struct draw_pt_middle_end *middle,
 	 output_format = PIPE_FORMAT_R32_FLOAT;
 	 emit_sz = 1 * sizeof(float);
          break;
+      case EMIT_OMIT:
+         continue;
       default:
          assert(0);
 	 output_format = PIPE_FORMAT_NONE;




More information about the mesa-commit mailing list