From 4ccda7bfd9712f1a9e29b9209e444c8e5652167c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathias=20Fr=C3=B6hlich?= Date: Mon, 9 Mar 2020 22:23:31 +0100 Subject: [PATCH] i965: Remove glbinding from brw_vertex_element. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: Rebase. Reviewed-by: Matt Turner Signed-off-by: Mathias Fröhlich Part-of: --- src/mesa/drivers/dri/i965/brw_context.h | 1 - src/mesa/drivers/dri/i965/brw_draw.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 95463c68d27..586f926fb18 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -447,7 +447,6 @@ struct brw_vertex_buffer { }; struct brw_vertex_element { const struct gl_array_attributes *glattrib; - const struct gl_vertex_buffer_binding *glbinding; int buffer; bool is_dual_slot; diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 3b1c95aedb8..152012a6c16 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -336,12 +336,6 @@ brw_merge_inputs(struct brw_context *brw) const struct gen_device_info *devinfo = &brw->screen->devinfo; const struct gl_context *ctx = &brw->ctx; - for (unsigned i = 0; i < VERT_ATTRIB_MAX; i++) { - struct brw_vertex_element *input = &brw->vb.inputs[i]; - _mesa_draw_attrib_and_binding(ctx, i, - &input->glattrib, &input->glbinding); - } - if (devinfo->gen < 8 && !devinfo->is_haswell) { /* Prior to Haswell, the hardware can't natively support GL_FIXED or * 2_10_10_10_REV vertex formats. Set appropriate workaround flags. -- 2.30.2