diff options
| author | Mathias Fröhlich <[email protected]> | 2020-03-09 22:23:31 +0100 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-10 14:28:37 +0000 |
| commit | 4ccda7bfd9712f1a9e29b9209e444c8e5652167c (patch) | |
| tree | e325d3f31c229a4906c8ece1dd49d4bb91ce8364 | |
| parent | 38db4f17200cb5bfeb550bb732ccace5052afb04 (diff) | |
i965: Remove glbinding from brw_vertex_element.
v2: Rebase.
Reviewed-by: Matt Turner <[email protected]>
Signed-off-by: Mathias Fröhlich <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/308>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw.c | 6 |
2 files changed, 0 insertions, 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. |