[Mesa-dev] [PATCH 09/10] i965: Make use of the vertex format functions in i965.

[Mathias.Froehlich at gmx.net]

From: Mathias Fröhlich <mathias.froehlich at web.de>

Signed-off-by: Mathias Fröhlich <Mathias.Froehlich at web.de>
---
 src/mesa/drivers/dri/i965/brw_draw.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 6e4a0a0213..e0d17cd449 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -344,9 +344,8 @@ brw_merge_inputs(struct brw_context *brw)
       GLbitfield vaomask = vs_inputs & _mesa_draw_array_bits(ctx);
       while (vaomask) {
          const gl_vert_attrib i = u_bit_scan(&vaomask);
-         const struct gl_array_attributes *glattrib
-            = _mesa_draw_array_attrib(vao, i);
-         const uint8_t wa_flags = get_wa_flags(&glattrib->Format);
+         const uint8_t wa_flags
+            = get_wa_flags(_mesa_draw_array_format(vao, i));
 
          if (brw->vb.attrib_wa_flags[i] != wa_flags) {
             brw->vb.attrib_wa_flags[i] = wa_flags;
@@ -357,9 +356,8 @@ brw_merge_inputs(struct brw_context *brw)
       GLbitfield currmask = vs_inputs & _mesa_draw_current_bits(ctx);
       while (currmask) {
          const gl_vert_attrib i = u_bit_scan(&currmask);
-         const struct gl_array_attributes *glattrib
-            = _mesa_draw_current_attrib(ctx, i);
-         const uint8_t wa_flags = get_wa_flags(&glattrib->Format);
+         const uint8_t wa_flags
+            = get_wa_flags(_mesa_draw_current_format(ctx, i));
 
          if (brw->vb.attrib_wa_flags[i] != wa_flags) {
             brw->vb.attrib_wa_flags[i] = wa_flags;
-- 
2.19.2