2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h
index 369c63eeceb..3e383aaa1ca 100644
--- a/src/gallium/drivers/i915/i915_context.h
+++ b/src/gallium/drivers/i915/i915_context.h
@@ -189,7 +189,7 @@ struct i915_sampler_state {
 
 struct i915_velems_state {
    unsigned count;
-   struct pipe_vertex_element velem[];
+   struct pipe_vertex_element velem[PIPE_MAX_ATTRIBS];
 };
 
 struct i915_texture {
diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index 46406065c37..8927dfc33d4 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -749,7 +749,7 @@ i915_create_vertex_elements_state(struct pipe_context *pipe,
 {
    struct i915_velems_state *velems;
    assert(count <= PIPE_MAX_ATTRIBS);
-   velems = (struct i915_velems_state *) MALLOC(sizeof(struct i915_velems_state) + count * sizeof(*attribs));
+   velems = (struct i915_velems_state *) MALLOC(sizeof(struct i915_velems_state));
    if (velems) {
       velems->count = count;
       memcpy(velems->velem, attribs, sizeof(*attribs) * count);