From 944e6274d62bcae39b009f3a6760d5f3a9f43cc2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 3 Feb 2021 13:13:51 -0500 Subject: [PATCH] mesa: don't update fixed-func programs on irrelevant _NEW_RENDER_MODE changes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The fixed-func vertex program uses it too, which was ignored. This commit fixes it. Reviewed-by: Zoltán Böszörményi Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/main/feedback.c | 3 ++- src/mesa/main/state.c | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index fbac508..b6776a1 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -416,7 +416,8 @@ _mesa_RenderMode( GLenum mode ) if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glRenderMode %s\n", _mesa_enum_to_string(mode)); - FLUSH_VERTICES(ctx, _NEW_RENDERMODE, 0); + FLUSH_VERTICES(ctx, _NEW_RENDERMODE | _NEW_FF_VERT_PROGRAM | + _NEW_FF_FRAG_PROGRAM, 0); switch (ctx->RenderMode) { case GL_RENDER: diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 4b2b3ae..389db5f 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -487,9 +487,8 @@ _mesa_update_state_locked( struct gl_context *ctx ) GLbitfield prog_flags = _NEW_PROGRAM; if (ctx->FragmentProgram._UsesTexEnvProgram) { - prog_flags |= _NEW_BUFFERS | _NEW_TEXTURE_OBJECT | - _NEW_FF_FRAG_PROGRAM | _NEW_RENDERMODE | - _NEW_COLOR | _NEW_TEXTURE_STATE; + prog_flags |= _NEW_BUFFERS | _NEW_TEXTURE_OBJECT | _NEW_COLOR | + _NEW_FF_FRAG_PROGRAM | _NEW_TEXTURE_STATE; } if (ctx->VertexProgram._UsesTnlProgram) -- 2.7.4