i965: Make use of the vertex format functions in i965.

v2: Style fixes.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/308>
This commit is contained in:
Mathias Fröhlich 2018-12-11 18:45:43 +01:00 committed by Marge Bot
parent cf929823bf
commit e62b82a693

View file

@ -347,9 +347,8 @@ brw_merge_inputs(struct brw_context *brw)
unsigned 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;
@ -360,9 +359,8 @@ brw_merge_inputs(struct brw_context *brw)
unsigned 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;