[Bf-blender-cvs] [26021984859] blender2.8: GWN: Add GWN_batch_uniform_mat4.

Clément Foucault noreply at git.blender.org
Wed May 2 20:54:25 CEST 2018


Commit: 26021984859b6c522a532e3613fe65ffed6cbc19
Author: Clément Foucault
Date:   Mon Apr 23 21:01:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB26021984859b6c522a532e3613fe65ffed6cbc19

GWN: Add GWN_batch_uniform_mat4.

===================================================================

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 23bec80a0d1..07ef96061b7 100644
--- a/intern/gawain/gawain/gwn_batch.h
+++ b/intern/gawain/gawain/gwn_batch.h
@@ -115,6 +115,7 @@ 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_uniform_mat4(Gwn_Batch*, const char* name, const float data[4][4]);
 
 void GWN_batch_draw(Gwn_Batch*);
 
diff --git a/intern/gawain/src/gwn_batch.c b/intern/gawain/src/gwn_batch.c
index 9243c9f6fc4..2e3a4eff0f0 100644
--- a/intern/gawain/src/gwn_batch.c
+++ b/intern/gawain/src/gwn_batch.c
@@ -503,6 +503,12 @@ void GWN_batch_uniform_4fv_array(Gwn_Batch* batch, const char* name, const int l
 	glUniform4fv(uniform->location, len, data);
 	}
 
+void GWN_batch_uniform_mat4(Gwn_Batch* batch, const char* name, const float data[4][4])
+	{
+	GET_UNIFORM
+	glUniformMatrix4fv(uniform->location, 1, GL_FALSE, (const float *)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