fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 06:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util/prim: use vertex count info in u_validate_pipe_prim()

Browse source 
As a side effect, primitives with adjacency are now correctly validated.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Acked-by: Zack Rusin <zackr@vmware.com>
This commit is contained in:
Chia-I Wu 2013-05-02 13:49:30 +08:00
parent ddf0e3930f
commit 30671cecc0
1 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gallium/auxiliary/util/u_prim.h
View file

@ -138,39 +138,9 @@ u_prim_vertex_count(unsigned prim)
static INLINE boolean u_validate_pipe_prim( unsigned pipe_prim, unsigned nr )
{
boolean ok = TRUE;
const struct u_prim_vertex_count *count = u_prim_vertex_count(pipe_prim);
switch (pipe_prim) {
case PIPE_PRIM_POINTS:
ok = (nr >= 1);
break;
case PIPE_PRIM_LINES:
ok = (nr >= 2);
break;
case PIPE_PRIM_LINE_STRIP:
case PIPE_PRIM_LINE_LOOP:
ok = (nr >= 2);
break;
case PIPE_PRIM_TRIANGLES:
ok = (nr >= 3);
break;
case PIPE_PRIM_TRIANGLE_STRIP:
case PIPE_PRIM_TRIANGLE_FAN:
case PIPE_PRIM_POLYGON:
ok = (nr >= 3);
break;
case PIPE_PRIM_QUADS:
ok = (nr >= 4);
break;
case PIPE_PRIM_QUAD_STRIP:
ok = (nr >= 4);
break;
default:
ok = 0;
break;
}
return ok;
return (count && nr >= count->min);
}