Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Gawain: look up array uniforms correctly

Browse Source 
Look up "name[0]" when asked for "name", since that marks the beginning of the array.

We're comparing to the name stored in ShaderInterface which comes from glGetActiveUniform.
This commit is contained in:
Mike Erwin
2017-04-13 00:51:18 -04:00
parent f7087109ce
commit 56e9629d96
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
intern/gawain/src/immediate.c
View File

@@ -754,8 +754,23 @@ void immUniform3fv(const char* name, const float data[3])
glUniform3fv(uniform->location, 1, data); glUniform3fv(uniform->location, 1, data);
} }
void immUniformArray3fv(const char* name, const float *data, int count) // can increase this limit or move to another file
#define MAX_UNIFORM_NAME_LEN 60
void immUniformArray3fv(const char* bare_name, const float *data, int count)
{ {
// look up "name[0]" when given "name"
const size_t len = strlen(bare_name);
#if TRUST_NO_ONE
assert(len <= MAX_UNIFORM_NAME_LEN);
#endif
char name[MAX_UNIFORM_NAME_LEN];
strcpy(name, bare_name);
name[len + 0] = '[';
name[len + 1] = '0';
name[len + 2] = ']';
name[len + 3] = '\0';
GET_UNIFORM GET_UNIFORM
glUniform3fv(uniform->location, count, data); glUniform3fv(uniform->location, count, data);
} }