From 9c1a6a208269dd2bef819a99d58a0a8bf04b2793 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 10 Jun 2017 00:01:21 +0200 Subject: [PATCH] mesa: simplify handling the return value of update_program MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle Reviewed-by: Brian Paul Reviewed-by: Timothy Arceri --- src/mesa/main/state.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 960b5381e9b..5d2d9f001a4 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -90,7 +90,6 @@ update_program(struct gl_context *ctx) const struct gl_program *prevTCP = ctx->TessCtrlProgram._Current; const struct gl_program *prevTEP = ctx->TessEvalProgram._Current; const struct gl_program *prevCP = ctx->ComputeProgram._Current; - GLbitfield new_state = 0x0; /* * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current @@ -213,9 +212,9 @@ update_program(struct gl_context *ctx) ctx->TessEvalProgram._Current != prevTEP || ctx->TessCtrlProgram._Current != prevTCP || ctx->ComputeProgram._Current != prevCP) - new_state |= _NEW_PROGRAM; + return _NEW_PROGRAM; - return new_state; + return 0; } -- 2.30.2