aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/svga
diff options
context:
space:
mode:
authorRoland Scheidegger <[email protected]>2010-03-09 14:23:00 +0100
committerRoland Scheidegger <[email protected]>2010-03-09 14:23:00 +0100
commite8983f70b41ea92a9527cb618db011b5dd136626 (patch)
tree1e73d7f45dc09106783b604752ec6b8b7a27778a /src/gallium/drivers/svga
parentfe9f8536f1b1e7a3a2ac10afd8078e8f4d327578 (diff)
gallium: don't use flexible array members in drivers for vertex elements cso
While this c99 feature should work with most compilers, valgrind doesn't really like it, and this only really saves some memory, we don't do this in similar occasions (like the blend state) neither.
Diffstat (limited to 'src/gallium/drivers/svga')
-rw-r--r--src/gallium/drivers/svga/svga_context.h2
-rw-r--r--src/gallium/drivers/svga/svga_pipe_vertex.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_context.h b/src/gallium/drivers/svga/svga_context.h
index 4d9f00991a7..791d30edc0e 100644
--- a/src/gallium/drivers/svga/svga_context.h
+++ b/src/gallium/drivers/svga/svga_context.h
@@ -171,7 +171,7 @@ struct svga_sampler_state {
struct svga_velems_state {
unsigned count;
- struct pipe_vertex_element velem[];
+ struct pipe_vertex_element velem[PIPE_MAX_ATTRIBS];
};
/* Use to calculate differences between state emitted to hardware and
diff --git a/src/gallium/drivers/svga/svga_pipe_vertex.c b/src/gallium/drivers/svga/svga_pipe_vertex.c
index 979deb12afb..d4a1280e74c 100644
--- a/src/gallium/drivers/svga/svga_pipe_vertex.c
+++ b/src/gallium/drivers/svga/svga_pipe_vertex.c
@@ -73,7 +73,7 @@ svga_create_vertex_elements_state(struct pipe_context *pipe,
{
struct svga_velems_state *velems;
assert(count <= PIPE_MAX_ATTRIBS);
- velems = (struct svga_velems_state *) MALLOC(sizeof(struct svga_velems_state) + count * sizeof(*attribs));
+ velems = (struct svga_velems_state *) MALLOC(sizeof(struct svga_velems_state));
if (velems) {
velems->count = count;
memcpy(velems->velem, attribs, sizeof(*attribs) * count);