draw: move hw vertex emit to a new module

1 files changed, 28 insertions, 133 deletions

diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
index cf37493eb6..8db9e31e2d 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
@@ -38,7 +38,7 @@ struct fetch_pipeline_middle_end {
    struct draw_pt_middle_end base;
    struct draw_context *draw;
 
-   struct translate *translate;
+   struct pt_emit *emit;
 
    unsigned pipeline_vertex_size;
    unsigned prim;
@@ -51,98 +51,12 @@ static void fetch_pipeline_prepare( struct draw_pt_middle_end *middle,
 				    unsigned opt )
 {
    struct fetch_pipeline_middle_end *fpme = (struct fetch_pipeline_middle_end *)middle;
-   struct draw_context *draw = fpme->draw;
-   unsigned i;
-   boolean ok;
-   const struct vertex_info *vinfo;
-   unsigned dst_offset;
-   struct translate_key hw_key;
 
    fpme->prim = prim;
    fpme->opt = opt;
 
-   if (!(opt & PT_PIPELINE)) {
-      ok = draw->render->set_primitive(draw->render, prim);
-      if (!ok) {
-	 assert(0);
-	 return;
-      }
-
-      /* Must do this after set_primitive() above:
-       */
-      vinfo = draw->render->get_vertex_info(draw->render);
-
-
-      /* In passthrough mode, need to translate from vertex shader
-       * outputs to hw vertices.
-       */
-      dst_offset = 0;
-      for (i = 0; i < vinfo->num_attribs; i++) {
-	 unsigned emit_sz = 0;
-	 unsigned src_buffer = 0;
-	 unsigned output_format;
-	 unsigned src_offset = (sizeof(struct vertex_header) + 
-				vinfo->src_index[i] * 4 * sizeof(float) );
-
-
-         
-	 switch (vinfo->emit[i]) {
-	 case EMIT_4F:
-	    output_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
-	    emit_sz = 4 * sizeof(float);
-	    break;
-	 case EMIT_3F:
-	    output_format = PIPE_FORMAT_R32G32B32_FLOAT;
-	    emit_sz = 3 * sizeof(float);
-	    break;
-	 case EMIT_2F:
-	    output_format = PIPE_FORMAT_R32G32_FLOAT;
-	    emit_sz = 2 * sizeof(float);
-	    break;
-	 case EMIT_1F:
-	    output_format = PIPE_FORMAT_R32_FLOAT;
-	    emit_sz = 1 * sizeof(float);
-	    break;
-	 case EMIT_1F_PSIZE:
-	    output_format = PIPE_FORMAT_R32_FLOAT;
-	    emit_sz = 1 * sizeof(float);
-	    src_buffer = 1;
-	    src_offset = 0;
-	    break;
-	 case EMIT_4UB:
-	    output_format = PIPE_FORMAT_B8G8R8A8_UNORM;
-	    emit_sz = 4 * sizeof(ubyte);
-	 default:
-	    assert(0);
-	    output_format = PIPE_FORMAT_NONE;
-	    emit_sz = 0;
-	    break;
-	 }
-      
-	 hw_key.element[i].input_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
-	 hw_key.element[i].input_buffer = src_buffer;
-	 hw_key.element[i].input_offset = src_offset;
-	 hw_key.element[i].output_format = output_format;
-	 hw_key.element[i].output_offset = dst_offset;
-
-	 dst_offset += emit_sz;
-      }
-
-      hw_key.nr_elements = vinfo->num_attribs;
-      hw_key.output_stride = vinfo->size * 4;
-
-      /* Don't bother with caching at this stage:
-       */
-      if (!fpme->translate ||
-	  memcmp(&fpme->translate->key, &hw_key, sizeof(hw_key)) != 0) 
-      {
-	 if (fpme->translate)
-	    fpme->translate->release(fpme->translate);
-
-	 fpme->translate = translate_generic_create( &hw_key );
-      }
-   }
-
+   if (!(opt & PT_PIPELINE)) 
+      draw_pt_emit_prepare( fpme->emit, prim, opt );
 
    //fpme->pipeline_vertex_size = sizeof(struct vertex_header) + nr * 4 * sizeof(float);
    fpme->pipeline_vertex_size = MAX_VERTEX_ALLOCATION;
@@ -194,43 +108,12 @@ static void fetch_pipeline_run( struct draw_pt_middle_end *middle,
                             draw_elts,
                             draw_count );
    } else {
-      struct translate *translate = fpme->translate;
-      void *hw_verts;
-
-      /* XXX: need to flush to get prim_vbuf.c to release its allocation?? 
-       */
-      draw_do_flush( draw, DRAW_FLUSH_BACKEND );
-
-      hw_verts = draw->render->allocate_vertices(draw->render,
-                                                 (ushort)fpme->translate->key.output_stride,
-                                                 (ushort)fetch_count);
-      if (!hw_verts) {
-         assert(0);
-         return;
-      }
-
-      translate->set_buffer(translate, 
-			    0, 
-			    pipeline_verts,
-			    fpme->pipeline_vertex_size );
-
-      translate->set_buffer(translate, 
-			    1, 
-			    &fpme->draw->rasterizer->point_size,
-			    0);
-
-      translate->run( translate,
-		      0, fetch_count,
-		      hw_verts );
-
-      draw->render->draw(draw->render,
-                         draw_elts,
-                         draw_count);
-
-      draw->render->release_vertices(draw->render,
-                                     hw_verts,
-                                     fpme->translate->key.output_stride,
-                                     fetch_count);
+      draw_pt_emit( fpme->emit,
+		    pipeline_verts,
+		    fpme->pipeline_vertex_size,
+		    fetch_count,
+		    draw_elts,
+		    draw_count );
    }
 
 
@@ -252,14 +135,26 @@ static void fetch_pipeline_destroy( struct draw_pt_middle_end *middle )
 
 struct draw_pt_middle_end *draw_pt_fetch_pipeline_or_emit( struct draw_context *draw )
 {
-   struct fetch_pipeline_middle_end *fetch_pipeline = CALLOC_STRUCT( fetch_pipeline_middle_end );
+   struct fetch_pipeline_middle_end *fpme = CALLOC_STRUCT( fetch_pipeline_middle_end );
+   if (!fpme)
+      goto fail;
+
+   fpme->base.prepare = fetch_pipeline_prepare;
+   fpme->base.run     = fetch_pipeline_run;
+   fpme->base.finish  = fetch_pipeline_finish;
+   fpme->base.destroy = fetch_pipeline_destroy;
+
+   fpme->draw = draw;
+
+   fpme->emit = draw_pt_emit_create( draw );
+   if (!fpme->emit) 
+      goto fail;
 
-   fetch_pipeline->base.prepare = fetch_pipeline_prepare;
-   fetch_pipeline->base.run     = fetch_pipeline_run;
-   fetch_pipeline->base.finish  = fetch_pipeline_finish;
-   fetch_pipeline->base.destroy = fetch_pipeline_destroy;
+   return &fpme->base;
 
-   fetch_pipeline->draw = draw;
+ fail:
+   if (fpme)
+      fetch_pipeline_destroy( &fpme->base );
 
-   return &fetch_pipeline->base;
+   return NULL;
 }