From 4e269cf8634a667f9d6e00e645ad4cfd1fb03ba2 Mon Sep 17 00:00:00 2001
From: Alec Iverson <adiverso93@gmail.com>
Date: Thu, 29 Sep 2016 13:46:38 -0700
Subject: [PATCH] Correct sfGlslBVec* members to sfBool from bool.

Corrected sfShader_setBvec*Uniform()s accordingly.

Fixes #105.
---
 include/SFML/Graphics/Glsl.h | 18 +++++++++---------
 src/SFML/Graphics/Shader.cpp |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/SFML/Graphics/Glsl.h b/include/SFML/Graphics/Glsl.h
index 62c23ff..f434c76 100644
--- a/include/SFML/Graphics/Glsl.h
+++ b/include/SFML/Graphics/Glsl.h
@@ -36,8 +36,8 @@ typedef sfVector2i sfGlslIvec2;
 
 typedef struct
 {
-    bool x;
-    bool y;
+    sfBool x;
+    sfBool y;
 } sfGlslBvec2;
 
 // 3D vectors
@@ -52,9 +52,9 @@ typedef struct
 
 typedef struct
 {
-    bool x;
-    bool y;
-    bool z;
+    sfBool x;
+    sfBool y;
+    sfBool z;
 } sfGlslBvec3;
 
 // 4D vectors
@@ -76,10 +76,10 @@ typedef struct
 
 typedef struct
 {
-    bool x;
-    bool y;
-    bool z;
-    bool w;
+    sfBool x;
+    sfBool y;
+    sfBool z;
+    sfBool w;
 } sfGlslBvec4;
 
 // matrices
diff --git a/src/SFML/Graphics/Shader.cpp b/src/SFML/Graphics/Shader.cpp
index c5276ac..fdaeb32 100644
--- a/src/SFML/Graphics/Shader.cpp
+++ b/src/SFML/Graphics/Shader.cpp
@@ -256,28 +256,28 @@ void sfShader_setIntColorUniform(sfShader* shader, const char* name, sfColor col
 ////////////////////////////////////////////////////////////
 void sfShader_setBoolUniform(sfShader* shader, const char* name, sfBool x)
 {
-	CSFML_CALL(shader, setUniform(name, x));
+	CSFML_CALL(shader, setUniform(name, x != sfFalse));
 }
 
 
 ////////////////////////////////////////////////////////////
 void sfShader_setBvec2Uniform(sfShader* shader, const char* name, sfGlslBvec2 vector)
 {
-	CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec2(vector.x, vector.y)));
+	CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec2(vector.x != sfFalse, vector.y != sfFalse)));
 }
 
 
 ////////////////////////////////////////////////////////////
 void sfShader_setBvec3Uniform(sfShader* shader, const char* name, sfGlslBvec3 vector)
 {
-	CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec3(vector.x, vector.y, vector.z)));
+	CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec3(vector.x != sfFalse, vector.y != sfFalse, vector.z != sfFalse)));
 }
 
 
 ////////////////////////////////////////////////////////////
 void sfShader_setBvec4Uniform(sfShader* shader, const char* name, sfGlslBvec4 vector)
 {
-	CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec4(vector.x, vector.y, vector.z, vector.w)));
+	CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec4(vector.x != sfFalse, vector.y != sfFalse, vector.z != sfFalse, vector.w != sfFalse)));
 }