diff options
| author | José Fonseca <[email protected]> | 2011-03-12 20:52:13 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2011-03-13 18:56:07 +0000 |
| commit | b79b05e17e197a7cdc523deff8f7ea456a91e8d0 (patch) | |
| tree | 1b68522fcbfdab38845c66f021412cf2e08fc12c | |
| parent | c448a556e9f97dd059de99048b75ebf6d51e1d7c (diff) | |
draw: Fix draw_variant_output::format's type.
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs.h | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs_aos_io.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/draw/draw_vs.h b/src/gallium/auxiliary/draw/draw_vs.h index bfb72d50efa..e6d187e9774 100644 --- a/src/gallium/auxiliary/draw/draw_vs.h +++ b/src/gallium/auxiliary/draw/draw_vs.h @@ -33,6 +33,7 @@ #include "draw_context.h" #include "draw_private.h" +#include "draw_vertex.h" struct draw_context; @@ -48,7 +49,7 @@ struct draw_variant_input struct draw_variant_output { - enum pipe_format format; /* output format */ + enum attrib_emit format; /* output format */ unsigned vs_output:8; /* which vertex shader output is this? */ unsigned offset:24; /* offset into output vertex */ }; diff --git a/src/gallium/auxiliary/draw/draw_vs_aos_io.c b/src/gallium/auxiliary/draw/draw_vs_aos_io.c index 8f8bbe7cb88..f1dd4487732 100644 --- a/src/gallium/auxiliary/draw/draw_vs_aos_io.c +++ b/src/gallium/auxiliary/draw/draw_vs_aos_io.c @@ -384,7 +384,7 @@ static void emit_store_R8G8B8A8_UNORM( struct aos_compilation *cp, static boolean emit_output( struct aos_compilation *cp, struct x86_reg ptr, struct x86_reg dataXMM, - unsigned format ) + enum attrib_emit format ) { switch (format) { case EMIT_1F: @@ -422,7 +422,7 @@ boolean aos_emit_outputs( struct aos_compilation *cp ) unsigned i; for (i = 0; i < cp->vaos->base.key.nr_outputs; i++) { - unsigned format = cp->vaos->base.key.element[i].out.format; + enum attrib_emit format = cp->vaos->base.key.element[i].out.format; unsigned offset = cp->vaos->base.key.element[i].out.offset; unsigned vs_output = cp->vaos->base.key.element[i].out.vs_output; |