diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2011-03-13 18:18:17 +0100 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2011-03-13 18:19:22 +0100 |
| commit | c448a556e9f97dd059de99048b75ebf6d51e1d7c (patch) | |
| tree | ac9642e2bbe6a47871b377dc3a3f2acb6ef5bb68 | |
| parent | 07838ff990a74e3acd95de7042042b49ecc51570 (diff) | |
nv50,nvc0: don't assert on cso with 0 vertex elements
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_stateobj.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_vbo.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_vbo.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/drivers/nv50/nv50_stateobj.h b/src/gallium/drivers/nv50/nv50_stateobj.h index cf5b92ef1a8..515e3e78d42 100644 --- a/src/gallium/drivers/nv50/nv50_stateobj.h +++ b/src/gallium/drivers/nv50/nv50_stateobj.h @@ -49,7 +49,7 @@ struct nv50_vertex_stateobj { boolean need_conversion; unsigned vertex_size; unsigned packet_vertex_limit; - struct nv50_vertex_element element[1]; + struct nv50_vertex_element element[0]; }; #endif diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c index 4f0a5018459..abdb9ce2f93 100644 --- a/src/gallium/drivers/nv50/nv50_vbo.c +++ b/src/gallium/drivers/nv50/nv50_vbo.c @@ -51,10 +51,8 @@ nv50_vertex_state_create(struct pipe_context *pipe, struct translate_key transkey; unsigned i; - assert(num_elements); - so = MALLOC(sizeof(*so) + - (num_elements - 1) * sizeof(struct nv50_vertex_element)); + num_elements * sizeof(struct nv50_vertex_element)); if (!so) return NULL; so->num_elements = num_elements; diff --git a/src/gallium/drivers/nvc0/nvc0_vbo.c b/src/gallium/drivers/nvc0/nvc0_vbo.c index 3698043029c..6bbcf2447ec 100644 --- a/src/gallium/drivers/nvc0/nvc0_vbo.c +++ b/src/gallium/drivers/nvc0/nvc0_vbo.c @@ -51,8 +51,6 @@ nvc0_vertex_state_create(struct pipe_context *pipe, struct translate_key transkey; unsigned i; - assert(num_elements); - so = MALLOC(sizeof(*so) + num_elements * sizeof(struct nvc0_vertex_element)); if (!so) |