summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300/r300_emit.h
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-05-02 06:24:55 +0200
committerMarek Olšák <maraeo@gmail.com>2010-05-02 12:56:34 +0200
commit68e720e12d51cf6d5237467a74af8c56b021acb7 (patch)
tree804718853b5add078944e5e1feeda6a16b4f5567 /src/gallium/drivers/r300/r300_emit.h
parent35232172db40fc756f3a0d1c17ed19e696a8878d (diff)
r300g: merge VS output mapping state (VAP) to rasterizer block state (RS)
These two should be tied together because what's set in VAP or stuffed in GA should be rasterized in RS. Not doing so causes a hardlock. The reason for the merge is that if stuffed texture coordinates (e.g. point sprite texgen) happen to occupy the texcoord slot dedicated to fog or wpos, the two must be relocated to other free slots, which needs remapping the vertex shader outputs. The rasterizer code is now literally a sequence read-rasterize-write.
Diffstat (limited to 'src/gallium/drivers/r300/r300_emit.h')
-rw-r--r--src/gallium/drivers/r300/r300_emit.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.h b/src/gallium/drivers/r300/r300_emit.h
index c3eb195d4e..3c0edf6fdc 100644
--- a/src/gallium/drivers/r300/r300_emit.h
+++ b/src/gallium/drivers/r300/r300_emit.h
@@ -81,9 +81,6 @@ void r300_emit_vertex_buffer(struct r300_context* r300);
void r300_emit_vertex_stream_state(struct r300_context* r300,
unsigned size, void* state);
-void r300_emit_vap_output_state(struct r300_context* r300,
- unsigned size, void* state);
-
void r300_emit_vs_constants(struct r300_context* r300,
unsigned size, void *state);