Mesa (7.10): draw: Fix draw_variant_output::format's type.
Brian Paul
brianp at kemper.freedesktop.org
Wed May 18 19:43:55 UTC 2011
Module: Mesa
Branch: 7.10
Commit: 4a14f76c69c71af8868747eed4999eed944af293
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a14f76c69c71af8868747eed4999eed944af293
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed May 18 13:42:52 2011 -0600
draw: Fix draw_variant_output::format's type.
(cherry picked from commit b79b05e17e197a7cdc523deff8f7ea456a91e8d0)
---
src/gallium/auxiliary/draw/draw_vs.h | 3 ++-
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 f9a0387..08175dd 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_varient_input
struct draw_varient_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 8f8bbe7..f1dd448 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;
More information about the mesa-commit
mailing list