diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2008-01-23 12:48:41 -0700 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-01-23 12:48:41 -0700 |
| commit | cd3643698eafa0869a8317b002e5b066de0172e7 (patch) | |
| tree | e7474c2e8079b5069b68adca09bd9882bf65c4c9 /src/mesa/pipe/softpipe/sp_state_derived.c | |
| parent | b3f081999f8eb904370df7492e39184268c77c13 (diff) | |
gallium: overhaul usage of vertex_info in draw module.
Remove all dependencies on vertex_info, except for draw_vbuf.
Drawing stages now strictly operate on post-transformed vertices and don't
know anything about hw vertices.
Use vertex program output info for two-side/flat/etc stages.
Temporarily disable vbuf module in softpipe driver.
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_state_derived.c')
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_state_derived.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c index 0f1410e5de..64e86a0d86 100644 --- a/src/mesa/pipe/softpipe/sp_state_derived.c +++ b/src/mesa/pipe/softpipe/sp_state_derived.c @@ -122,6 +122,8 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe ) } } + draw_compute_vertex_size(vinfo); + softpipe->nr_frag_attrs = fs->num_inputs; /* We want these after all other attribs since they won't get passed @@ -146,10 +148,11 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe ) if (1/*vinfo->attr_mask != softpipe->attr_mask*/) { /*softpipe->attr_mask = vinfo->attr_mask;*/ - draw_set_vertex_info( softpipe->draw, vinfo); + /*draw_set_vertex_info( softpipe->draw, vinfo);*/ - draw_set_twoside_attributes(softpipe->draw, + /*draw_set_twoside_attributes(softpipe->draw, front0, back0, front1, back1); + */ } } |