[Bf-blender-cvs] [c462500] blender2.8: Gawain: more ways to set uniform color

Mike Erwin noreply at git.blender.org
Wed Oct 5 19:45:57 CEST 2016


Commit: c4625006185202f9bf82c664d08692c6fde3f654
Author: Mike Erwin
Date:   Wed Oct 5 13:12:18 2016 -0400
Branches: blender2.8
https://developer.blender.org/rBc4625006185202f9bf82c664d08692c6fde3f654

Gawain: more ways to set uniform color

===================================================================

M	source/blender/gpu/gawain/immediate.c
M	source/blender/gpu/gawain/immediate.h

===================================================================

diff --git a/source/blender/gpu/gawain/immediate.c b/source/blender/gpu/gawain/immediate.c
index 3fb6fee..ebe25e8 100644
--- a/source/blender/gpu/gawain/immediate.c
+++ b/source/blender/gpu/gawain/immediate.c
@@ -650,16 +650,26 @@ void immVertex2iv(unsigned attrib_id, const int data[2])
 	immEndVertex();
 	}
 
-void immUniformColor3ubv(const unsigned char rgb[3])
+void immUniformColor3ub(unsigned char r, unsigned char g, unsigned char b)
 	{
 	const float scale = 1.0f / 255.0f;
-	immUniform4f("color", scale * rgb[0], scale * rgb[1], scale * rgb[2], 1.0f);
+	immUniform4f("color", scale * r, scale * g, scale * b, 1.0f);
 	}
 
-void immUniformColor4ubv(const unsigned char rgba[4])
+void immUniformColor4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
 	{
 	const float scale = 1.0f / 255.0f;
-	immUniform4f("color", scale * rgba[0], scale * rgba[1], scale * rgba[2], scale * rgba[3]);
+	immUniform4f("color", scale * r, scale * g, scale * b, scale * a);
+	}
+
+void immUniformColor3ubv(const unsigned char rgb[3])
+	{
+	immUniformColor3ub(rgb[0], rgb[1], rgb[2]);
+	}
+
+void immUniformColor4ubv(const unsigned char rgba[4])
+	{
+	immUniformColor4ub(rgba[0], rgba[1], rgba[2], rgba[3]);
 	}
 
 void immUniform1i(const char *name, const unsigned int data)
@@ -671,4 +681,4 @@ void immUniform1i(const char *name, const unsigned int data)
 #endif
 
 	glUniform1i(loc, data);
-	}
\ No newline at end of file
+	}
diff --git a/source/blender/gpu/gawain/immediate.h b/source/blender/gpu/gawain/immediate.h
index 3fcf856..59c58ed 100644
--- a/source/blender/gpu/gawain/immediate.h
+++ b/source/blender/gpu/gawain/immediate.h
@@ -71,6 +71,8 @@ void immUniform4f(const char* name, float x, float y, float z, float w);
 
 // these set "uniform vec4 color"
 // TODO: treat as sRGB?
+void immUniformColor3ub(unsigned char r, unsigned char g, unsigned char b);
+void immUniformColor4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 void immUniformColor3ubv(const unsigned char data[3]);
 void immUniformColor4ubv(const unsigned char data[4]);




More information about the Bf-blender-cvs mailing list