From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 9 Jun 2017 22:01:21 +0000 (+0200)
Subject: mesa: simplify handling the return value of update_program
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c1a6a208269dd2bef819a99d58a0a8bf04b2793;p=mesa.git

mesa: simplify handling the return value of update_program

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

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;
 }