[Bf-blender-cvs] [3c48a21833f] blender2.8: GWN: Batch: Add GWN_batch_uniform_4fv_array
Clément Foucault
noreply at git.blender.org
Thu Mar 29 14:22:53 CEST 2018
Commit: 3c48a21833fde41b9dcd3650518af85d44ce91ed
Author: Clément Foucault
Date: Thu Mar 29 03:00:29 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3c48a21833fde41b9dcd3650518af85d44ce91ed
GWN: Batch: Add GWN_batch_uniform_4fv_array
===================================================================
M intern/gawain/gawain/gwn_batch.h
M intern/gawain/src/gwn_batch.c
===================================================================
diff --git a/intern/gawain/gawain/gwn_batch.h b/intern/gawain/gawain/gwn_batch.h
index 3e90ef091f1..a6c071abfbe 100644
--- a/intern/gawain/gawain/gwn_batch.h
+++ b/intern/gawain/gawain/gwn_batch.h
@@ -113,6 +113,7 @@ void GWN_batch_uniform_4f(Gwn_Batch*, const char* name, float x, float y, float
void GWN_batch_uniform_2fv(Gwn_Batch*, const char* name, const float data[2]);
void GWN_batch_uniform_3fv(Gwn_Batch*, const char* name, const float data[3]);
void GWN_batch_uniform_4fv(Gwn_Batch*, const char* name, const float data[4]);
+void GWN_batch_uniform_4fv_array(Gwn_Batch*, const char* name, int len, const float *data);
void GWN_batch_draw(Gwn_Batch*);
diff --git a/intern/gawain/src/gwn_batch.c b/intern/gawain/src/gwn_batch.c
index c720ba967b5..8b16e8e1905 100644
--- a/intern/gawain/src/gwn_batch.c
+++ b/intern/gawain/src/gwn_batch.c
@@ -489,6 +489,12 @@ void GWN_batch_uniform_4fv(Gwn_Batch* batch, const char* name, const float data[
glUniform4fv(uniform->location, 1, data);
}
+void GWN_batch_uniform_4fv_array(Gwn_Batch* batch, const char* name, const int len, const float *data)
+ {
+ GET_UNIFORM
+ glUniform4fv(uniform->location, len, data);
+ }
+
static void primitive_restart_enable(const Gwn_IndexBuf *el)
{
// TODO(fclem) Replace by GL_PRIMITIVE_RESTART_FIXED_INDEX when we have ogl 4.3
More information about the Bf-blender-cvs
mailing list