Mesa (master): util/prim: use vertex count info in u_validate_pipe_prim()
Chia-I Wu
olv at kemper.freedesktop.org
Fri May 3 04:00:36 UTC 2013
Module: Mesa
Branch: master
Commit: 30671cecc0817ffe59b47e8f70b584bb55447f5d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=30671cecc0817ffe59b47e8f70b584bb55447f5d
Author: Chia-I Wu <olvaffe at gmail.com>
Date: Thu May 2 13:49:30 2013 +0800
util/prim: use vertex count info in u_validate_pipe_prim()
As a side effect, primitives with adjacency are now correctly validated.
Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Acked-by: Zack Rusin <zackr at vmware.com>
---
src/gallium/auxiliary/util/u_prim.h | 34 ++--------------------------------
1 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_prim.h b/src/gallium/auxiliary/util/u_prim.h
index 7415e76..94312c2 100644
--- a/src/gallium/auxiliary/util/u_prim.h
+++ b/src/gallium/auxiliary/util/u_prim.h
@@ -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;
-
- 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;
- }
+ const struct u_prim_vertex_count *count = u_prim_vertex_count(pipe_prim);
- return ok;
+ return (count && nr >= count->min);
}
More information about the mesa-commit
mailing list