Commits ff2cfb8989cd and 5379a70d3fab introduced
try_emit_mad_for_and_not for ir_to_mesa and glsl_to_tgsi respectively.
In both cases the methods had a return type of "bool" instead of
"GLboolean".
Signed-off-by: Kai Wasserbäch <k...@dev.carbon-project.org>
---
src/mesa/program/ir_to_mesa.cpp | 4 ++--
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index ec3fba1..9b8165a 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -314,7 +314,7 @@ public:
GLboolean try_emit_mad(ir_expression *ir,
int mul_operand);
- bool try_emit_mad_for_and_not(ir_expression *ir,
+ GLboolean try_emit_mad_for_and_not(ir_expression *ir,
int mul_operand);
GLboolean try_emit_sat(ir_expression *ir);
@@ -911,7 +911,7 @@ ir_to_mesa_visitor::try_emit_mad(ir_expression *ir, int mul_operand)
* This final expression can be implemented as a single MAD(a, -b, a)
* instruction.
*/
-bool
+GLboolean
ir_to_mesa_visitor::try_emit_mad_for_and_not(ir_expression *ir, int try_operand)
{
const int other_operand = 1 - try_operand;
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 4b3e00c..e8ae308 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -392,7 +392,7 @@ public:
GLboolean try_emit_mad(ir_expression *ir,
int mul_operand);
- bool try_emit_mad_for_and_not(ir_expression *ir,
+ GLboolean try_emit_mad_for_and_not(ir_expression *ir,
int mul_operand);
GLboolean try_emit_sat(ir_expression *ir);
@@ -1229,7 +1229,7 @@ glsl_to_tgsi_visitor::try_emit_mad(ir_expression *ir, int mul_operand)
* This final expression can be implemented as a single MAD(a, -b, a)
* instruction.
*/
-bool
+GLboolean
glsl_to_tgsi_visitor::try_emit_mad_for_and_not(ir_expression *ir, int try_operand)
{
const int other_operand = 1 - try_operand;
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
