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.

1 files changed, 0 insertions, 10 deletions

diff --git a/src/gallium/drivers/r300/r300_vs.h b/src/gallium/drivers/r300/r300_vs.h
index 56bcc3b70b..57b3fbca0b 100644
--- a/src/gallium/drivers/r300/r300_vs.h
+++ b/src/gallium/drivers/r300/r300_vs.h
@@ -39,7 +39,6 @@ struct r300_vertex_shader {
 
     struct tgsi_shader_info info;
     struct r300_shader_semantics outputs;
-    struct r300_vap_output_state vap_out;
 
     /* Whether the shader was replaced by a dummy one due to a shader
      * compilation failure. */
@@ -49,12 +48,6 @@ struct r300_vertex_shader {
     unsigned externals_count;
     unsigned immediates_count;
 
-    /* Stream locations for SWTCL or if TCL is bypassed. */
-    int stream_loc_notcl[16];
-
-    /* Output stream location for WPOS. */
-    int wpos_tex_output;
-
     /* HWTCL-specific.  */
     /* Machine code (if translated) */
     struct r300_vertex_program_code code;
@@ -67,7 +60,4 @@ void r300_translate_vertex_shader(struct r300_context* r300,
                                   struct r300_vertex_shader* vs,
                                   const struct tgsi_token *tokens);
 
-/* Return TRUE if VAP (hwfmt) needs to be re-emitted. */
-boolean r300_vertex_shader_setup_wpos(struct r300_context* r300);
-
 #endif /* R300_VS_H */