diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-06-12 12:09:34 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-06-12 12:09:34 -0400 |
| commit | 1036ef2bf468611d37b5df06fc4424f2002e3837 (patch) | |
| tree | f0859a6d903c2570a0a00c918da88139f8f7d065 /src/gallium/auxiliary/draw/draw_pt_fetch_emit.c | |
| parent | 917f8bc1a85e61311cef6478127b387df70fba14 (diff) | |
| parent | 1cd0afffc9edbcac690f8ab436aecfced26b0aba (diff) | |
Merge master and fix conflicts
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_pt_fetch_emit.c')
| -rw-r--r-- | 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 6b7d02a19b..e7fe6b3b76 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; |