Merge branch 'width0'

[mesa.git] / src / gallium / auxiliary / draw / draw_vs.h

diff --git a/src/gallium/auxiliary/draw/draw_vs.h b/src/gallium/auxiliary/draw/draw_vs.h
index 677be0d28d020154c0f4486a5144a5b1ad2dcd54..89ae158751a931edc5b3c49ed50ebf0dcb3d0b38 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_vs.h
+++ b/src/gallium/auxiliary/draw/draw_vs.h
@@ -38,53 +38,58 @@
 struct draw_context;
 struct pipe_shader_state;
 
-struct draw_vs_input 
+struct draw_varient_input 
 {
    enum pipe_format format;
    unsigned buffer;
    unsigned offset; 
 };
 
-struct draw_vs_output
+struct draw_varient_output
 {
-   enum pipe_format format;
-   unsigned offset;
+   enum pipe_format format;     /* output format */
+   unsigned vs_output:8;        /* which vertex shader output is this? */
+   unsigned offset:24;          /* offset into output vertex */
 };
 
-struct draw_vs_element {
-   struct draw_vs_input in;
-   struct draw_vs_output out;
+struct draw_varient_element {
+   struct draw_varient_input in;
+   struct draw_varient_output out;
 };
 
 struct draw_vs_varient_key {
    unsigned output_stride;
-   unsigned nr_elements;
-   struct draw_vs_element element[PIPE_MAX_ATTRIBS];
+   unsigned nr_elements:8;      /* max2(nr_inputs, nr_outputs) */
+   unsigned nr_inputs:8;
+   unsigned nr_outputs:8;
+   unsigned viewport:1;
+   unsigned clip:1;
+   unsigned const_vbuffers:5;
+   struct draw_varient_element element[PIPE_MAX_ATTRIBS];
 };
 
+struct draw_vs_varient;
+
+
 struct draw_vs_varient {
    struct draw_vs_varient_key key;
 
    struct draw_vertex_shader *vs;
 
-   void (*set_input)( struct draw_vs_varient *,
+   void (*set_buffer)( struct draw_vs_varient *,
                       unsigned i,
                       const void *ptr,
                       unsigned stride );
 
-   void (*set_constants)( struct draw_vs_varient *,
-                          const float (*constants)[4] );
-
-
-   void (*run_linear)( struct draw_vs_varient *shader,
-                       unsigned start,
-                      unsigned count,
-                      void *output_buffer );
+   void (PIPE_CDECL *run_linear)( struct draw_vs_varient *shader,
+                                  unsigned start,
+                                  unsigned count,
+                                  void *output_buffer );
 
-   void (*run_elts)( struct draw_vs_varient *shader,
-                     const unsigned *elts,
-                     unsigned count,
-                     void *output_buffer );
+   void (PIPE_CDECL *run_elts)( struct draw_vs_varient *shader,
+                                const unsigned *elts,
+                                unsigned count,
+                                void *output_buffer );
 
    void (*destroy)( struct draw_vs_varient * );
 };
@@ -101,11 +106,17 @@ struct draw_vertex_shader {
    struct pipe_shader_state   state;
 
    struct tgsi_shader_info info;
+   unsigned position_output;
+
+   /* Extracted from shader:
+    */
+   const float (*immediates)[4];
 
    /* 
     */
    struct draw_vs_varient *varient[16];
    unsigned nr_varients;
+   unsigned last_varient;
    struct draw_vs_varient *(*create_varient)( struct draw_vertex_shader *shader,
                                               const struct draw_vs_varient_key *key );
 
@@ -146,10 +157,24 @@ struct draw_vertex_shader *
 draw_create_vs_sse(struct draw_context *draw,
                   const struct pipe_shader_state *templ);
 
+struct draw_vertex_shader *
+draw_create_vs_ppc(struct draw_context *draw,
+                  const struct pipe_shader_state *templ);
+
 struct draw_vertex_shader *
 draw_create_vs_llvm(struct draw_context *draw,
                    const struct pipe_shader_state *templ);
 
+
+
+struct draw_vs_varient_key;
+struct draw_vertex_shader;
+
+struct draw_vs_varient *draw_vs_varient_aos_sse( struct draw_vertex_shader *vs,
+                                                 const struct draw_vs_varient_key *key );
+
+
+
 /********************************************************************************
  * Helpers for vs implementations that don't do their own fetch/emit varients.
  * Means these can be shared between shaders.
@@ -171,7 +196,7 @@ struct draw_vs_varient *draw_vs_varient_generic( struct draw_vertex_shader *vs,
 
 static INLINE int draw_vs_varient_keysize( const struct draw_vs_varient_key *key )
 {
-   return 2 * sizeof(int) + key->nr_elements * sizeof(struct draw_vs_element);
+   return 2 * sizeof(int) + key->nr_elements * sizeof(struct draw_varient_element);
 }
 
 static INLINE int draw_vs_varient_key_compare( const struct draw_vs_varient_key *a,
@@ -182,7 +207,14 @@ static INLINE int draw_vs_varient_key_compare( const struct draw_vs_varient_key
 }
 
 
+struct aos_machine *draw_vs_aos_machine( void );
+void draw_vs_aos_machine_destroy( struct aos_machine *machine );
+
+void draw_vs_aos_machine_constants( struct aos_machine *machine,
+                                    const float (*constants)[4] );
 
+void draw_vs_aos_machine_viewport( struct aos_machine *machine,
+                                   const struct pipe_viewport_state *viewport );
 
 
 #define MAX_TGSI_VERTICES 4