Commit: e86bd787454fec0a937a41e7df093a82974474c7
Author: Mike Erwin
Date: Thu Oct 6 09:37:04 2016 -0400
Branches: blender2.8
https://developer.blender.org/rBe86bd787454fec0a937a41e7df093a82974474c7
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 ebe25e8..e0d1490 100644
--- a/source/blender/gpu/gawain/immediate.c
+++ b/source/blender/gpu/gawain/immediate.c
@@ -650,6 +650,16 @@ void immVertex2iv(unsigned attrib_id, const int data[2])
immEndVertex();
}
+void immUniformColor3fv(const float rgb[3])
+ {
+ immUniform4f("color", rgb[0], rgb[1], rgb[2], 1.0f);
+ }
+
+void immUniformColor4fv(const float rgba[4])
+ {
+ immUniform4f("color", rgba[0], rgba[1], rgba[2], rgba[3]);
+ }
+
void immUniformColor3ub(unsigned char r, unsigned char g, unsigned char b)
{
const float scale = 1.0f / 255.0f;
diff --git a/source/blender/gpu/gawain/immediate.h
b/source/blender/gpu/gawain/immediate.h
index 59c58ed..ae6c26b 100644
--- a/source/blender/gpu/gawain/immediate.h
+++ b/source/blender/gpu/gawain/immediate.h
@@ -70,7 +70,9 @@ void immUniform1f(const char* name, float x);
void immUniform4f(const char* name, float x, float y, float z, float w);
// these set "uniform vec4 color"
-// TODO: treat as sRGB?
+void immUniformColor3fv(const float rgb[3]);
+void immUniformColor4fv(const float rgba[4]);
+// TODO: v-- treat as sRGB? --v
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]);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
