From f24bf4521023658012b2636a24cf2387fd55695a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20Fr=C3=B6hlich?= Date: Sun, 1 Apr 2018 20:18:36 +0200 Subject: [PATCH] st/mesa: Use _DrawVAO for edgeflag enabled check. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Brian Paul Signed-off-by: Mathias Fröhlich --- src/mesa/state_tracker/st_atom.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c index 45a45960a30..df1a94e831e 100644 --- a/src/mesa/state_tracker/st_atom.c +++ b/src/mesa/state_tracker/st_atom.c @@ -27,6 +27,7 @@ #include +#include "main/arrayobj.h" #include "main/glheader.h" #include "main/context.h" @@ -138,19 +139,15 @@ static void check_program_state( struct st_context *st ) static void check_attrib_edgeflag(struct st_context *st) { - const struct gl_vertex_array *arrays = st->ctx->Array._DrawArrays; - const struct gl_vertex_buffer_binding *binding; GLboolean vertdata_edgeflags, edgeflag_culls_prims, edgeflags_enabled; struct gl_program *vp = st->ctx->VertexProgram._Current; - if (!arrays) - return; - edgeflags_enabled = st->ctx->Polygon.FrontMode != GL_FILL || st->ctx->Polygon.BackMode != GL_FILL; - binding = arrays[VERT_ATTRIB_EDGEFLAG].BufferBinding; - vertdata_edgeflags = edgeflags_enabled && binding->Stride != 0; + vertdata_edgeflags = edgeflags_enabled && + _mesa_draw_edge_flag_array_enabled(st->ctx); + if (vertdata_edgeflags != st->vertdata_edgeflags) { st->vertdata_edgeflags = vertdata_edgeflags; if (vp)