From: Brian Paul <brianp@vmware.com>
Date: Sat, 4 May 2019 16:00:08 +0000 (-0600)
Subject: glsl: s/GLboolean/bool/ to silence MSVC compiler warning
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e28983ed2c06a20526759f3fedf8ee5bd21f7f6;p=mesa.git

glsl: s/GLboolean/bool/ to silence MSVC compiler warning

It complains about mixing GLboolean and bool in the |= expression.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index d99ab3d46ce..41f2a97dfff 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -2226,7 +2226,7 @@ do_common_optimization(exec_list *ir, bool linked,
                        bool native_integers)
 {
    const bool debug = false;
-   GLboolean progress = GL_FALSE;
+   bool progress = false;
 
 #define OPT(PASS, ...) do {                                             \
       if (debug) {                                                      \