From: Mathias Fröhlich <mathias.froehlich@web.de>
Date: Mon, 9 Mar 2020 21:23:31 +0000 (+0100)
Subject: i965: Remove glbinding from brw_vertex_element.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4ccda7bfd9712f1a9e29b9209e444c8e5652167c;p=mesa.git

i965: Remove glbinding from brw_vertex_element.

v2: Rebase.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/308>
---

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.