blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Gawain: new immUniform4fv function

This commit is contained in:
Mike Erwin 2016-10-16 16:59:57 -04:00
parent f7414b7412
commit 9cdf4afb76
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/gpu/gawain/immediate.c
View File

@ -701,6 +701,17 @@ void immUniform4f(const char* name, float x, float y, float z, float w)
glUniform4f(loc, x, y, z, w);
}
void immUniform4fv(const char* name, const float data[4])
{
int loc = glGetUniformLocation(imm.bound_program, name);
#if TRUST_NO_ONE
assert(loc != -1);
#endif
glUniform4fv(loc, 1, data);
}
void immUniform1i(const char* name, int x)
{
int loc = glGetUniformLocation(imm.bound_program, name);
@ -722,7 +733,7 @@ void immUniformColor4f(float r, float g, float b, float a)
void immUniformColor4fv(const float rgba[4])
{
immUniform4f("color", rgba[0], rgba[1], rgba[2], rgba[3]);
immUniform4fv("color", rgba);
}
void immUniformColor3fv(const float rgb[3])

1
source/blender/gpu/gawain/immediate.h
View File

@ -76,6 +76,7 @@ void immVertex2iv(unsigned attrib_id, const int data[2]);
void immUniform1i(const char* name, int x);
void immUniform1f(const char* name, float x);
void immUniform4f(const char* name, float x, float y, float z, float w);
void immUniform4fv(const char* name, const float data[4]);
// convenience functions for setting "uniform vec4 color"