Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-04-13 01:20:58 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-13 08:07:50 +0300
commit6bfb9b7b5f164b303433d729d1cbe38f1ba44366 (patch)
tree5ad4cd0815bd481fbfac7a3a3383987cd4ee39a8 /intern
parentc61b7b02635f90529b8c08a6914e87dda5f77df0 (diff)
Gawain: add immUniform4iv
Needed soon by OCIO.
Diffstat (limited to 'intern')
-rw-r--r--intern/gawain/gawain/immediate.h1
-rw-r--r--intern/gawain/src/immediate.c10
2 files changed, 11 insertions, 0 deletions
diff --git a/intern/gawain/gawain/immediate.h b/intern/gawain/gawain/immediate.h
index 6a039542065..62754306abe 100644
--- a/intern/gawain/gawain/immediate.h
+++ b/intern/gawain/gawain/immediate.h
@@ -79,6 +79,7 @@ void immVertex2iv(unsigned attrib_id, const int data[2]);
// provide uniform values that don't change for the entire draw call
void immUniform1i(const char* name, int x);
+void immUniform4iv(const char* name, const int data[4]);
void immUniform1f(const char* name, float x);
void immUniform2f(const char* name, float x, float y);
void immUniform2fv(const char* name, const float data[2]);
diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c
index c6d87cbc029..2fd2d2480a7 100644
--- a/intern/gawain/src/immediate.c
+++ b/intern/gawain/src/immediate.c
@@ -827,6 +827,16 @@ void immUniform1i(const char* name, int x)
glUniform1i(loc, x);
}
+void immUniform4iv(const char* name, const int data[4])
+ {
+ int loc = glGetUniformLocation(imm.bound_program, name);
+
+#if TRUST_NO_ONE
+ assert(loc != -1);
+#endif
+
+ glUniform4iv(loc, 1, data);
+ }
// --- convenience functions for setting "uniform vec4 color" ---