diff options
| author | Mathias Fröhlich <[email protected]> | 2018-04-01 20:18:36 +0200 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2018-05-10 07:06:16 +0200 |
| commit | 899476b6b1d41c5ed08391843110c7d62b2ca863 (patch) | |
| tree | 07935e6dd529528056862050adcbd14dce9eb8e0 | |
| parent | 0fabd5530623bb7b6a13ce35c24b665d3661f76f (diff) | |
i965: Remove the now unused gl_vertex_array.
Was meant to be temporary in i965.
Reviewed-by: Brian Paul <[email protected]>
Signed-off-by: Mathias Fröhlich <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw.c | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index d3c2450a88a..7dcbd040f01 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -37,7 +37,6 @@ #include "main/macros.h" #include "main/mtypes.h" #include "main/errors.h" -#include "vbo/vbo.h" #include "brw_structs.h" #include "brw_pipe_control.h" #include "compiler/brw_compiler.h" @@ -966,9 +965,6 @@ struct brw_context * These bitfields indicate which workarounds are needed. */ uint8_t attrib_wa_flags[VERT_ATTRIB_MAX]; - - /* For the initial pushdown, keep the list of vbo inputs. */ - struct vbo_inputs draw_arrays; } vb; struct { diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 3b47dc7b26b..ae3b7be2ddd 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -936,10 +936,6 @@ brw_draw_prims(struct gl_context *ctx, struct brw_transform_feedback_object *xfb_obj = (struct brw_transform_feedback_object *) gl_xfb_obj; - /* The initial pushdown of the inputs array into the drivers */ - _mesa_set_drawing_arrays(ctx, brw->vb.draw_arrays.inputs); - _vbo_update_inputs(ctx, &brw->vb.draw_arrays); - if (!brw_check_conditional_render(brw)) return; @@ -1078,9 +1074,6 @@ brw_init_draw_functions(struct dd_function_table *functions) void brw_draw_init(struct brw_context *brw) { - /* Keep our list of gl_vertex_array inputs */ - _vbo_init_inputs(&brw->vb.draw_arrays); - for (int i = 0; i < VERT_ATTRIB_MAX; i++) brw->vb.inputs[i].buffer = -1; brw->vb.nr_buffers = 0; |