[Bf-blender-cvs] [c65c4fb77bf] blender2.8: GWN: Add GWN_batch_uniform_2fv_array.
Clément Foucault
noreply at git.blender.org
Thu Apr 5 16:08:29 CEST 2018
Commit: c65c4fb77bfac81d1ad1e1883256f682d0c63983
Author: Clément Foucault
Date: Thu Apr 5 15:37:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc65c4fb77bfac81d1ad1e1883256f682d0c63983
GWN: Add GWN_batch_uniform_2fv_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 a6c071abfbe..23bec80a0d1 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_2fv_array(Gwn_Batch*, const char* name, int len, const float *data);
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 7d455dd4629..9243c9f6fc4 100644
--- a/intern/gawain/src/gwn_batch.c
+++ b/intern/gawain/src/gwn_batch.c
@@ -491,6 +491,12 @@ void GWN_batch_uniform_4fv(Gwn_Batch* batch, const char* name, const float data[
glUniform4fv(uniform->location, 1, data);
}
+void GWN_batch_uniform_2fv_array(Gwn_Batch* batch, const char* name, const int len, const float *data)
+ {
+ GET_UNIFORM
+ glUniform2fv(uniform->location, len, data);
+ }
+
void GWN_batch_uniform_4fv_array(Gwn_Batch* batch, const char* name, const int len, const float *data)
{
GET_UNIFORM
More information about the Bf-blender-cvs
mailing list