draw: use u_reduced_prim() function
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
#include "draw/draw_vs.h"
|
||||
#include "tgsi/tgsi_dump.h"
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_prim.h"
|
||||
|
||||
static unsigned trim( unsigned count, unsigned first, unsigned incr )
|
||||
{
|
||||
@@ -278,7 +279,7 @@ void
|
||||
draw_arrays(struct draw_context *draw, unsigned prim,
|
||||
unsigned start, unsigned count)
|
||||
{
|
||||
unsigned reduced_prim = draw_pt_reduced_prim(prim);
|
||||
unsigned reduced_prim = u_reduced_prim(prim);
|
||||
if (reduced_prim != draw->reduced_prim) {
|
||||
draw_do_flush( draw, DRAW_FLUSH_STATE_CHANGE );
|
||||
draw->reduced_prim = reduced_prim;
|
||||
|
||||
@@ -228,7 +228,6 @@ void draw_pt_post_vs_destroy( struct pt_post_vs *pvs );
|
||||
* Utils:
|
||||
*/
|
||||
void draw_pt_split_prim(unsigned prim, unsigned *first, unsigned *incr);
|
||||
unsigned draw_pt_reduced_prim(unsigned prim);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -75,28 +75,3 @@ void draw_pt_split_prim(unsigned prim, unsigned *first, unsigned *incr)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
unsigned draw_pt_reduced_prim(unsigned prim)
|
||||
{
|
||||
switch (prim) {
|
||||
case PIPE_PRIM_POINTS:
|
||||
return PIPE_PRIM_POINTS;
|
||||
case PIPE_PRIM_LINES:
|
||||
case PIPE_PRIM_LINE_STRIP:
|
||||
case PIPE_PRIM_LINE_LOOP:
|
||||
return PIPE_PRIM_LINES;
|
||||
case PIPE_PRIM_TRIANGLES:
|
||||
case PIPE_PRIM_TRIANGLE_STRIP:
|
||||
case PIPE_PRIM_TRIANGLE_FAN:
|
||||
case PIPE_PRIM_POLYGON:
|
||||
case PIPE_PRIM_QUADS:
|
||||
case PIPE_PRIM_QUAD_STRIP:
|
||||
return PIPE_PRIM_TRIANGLES;
|
||||
default:
|
||||
assert(0);
|
||||
return PIPE_PRIM_POINTS;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
*/
|
||||
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_prim.h"
|
||||
#include "draw/draw_context.h"
|
||||
#include "draw/draw_private.h"
|
||||
#include "draw/draw_pt.h"
|
||||
@@ -467,7 +468,7 @@ vcache_prepare( struct draw_pt_front_end *frontend,
|
||||
}
|
||||
|
||||
vcache->input_prim = prim;
|
||||
vcache->output_prim = draw_pt_reduced_prim(prim);
|
||||
vcache->output_prim = u_reduced_prim(prim);
|
||||
|
||||
vcache->middle = middle;
|
||||
vcache->opt = opt;
|
||||
|
||||
Reference in New Issue
Block a user