[Bf-blender-cvs] [f7b1b87ba9] blender2.8: Gawain: minor cleanup

Mike Erwin noreply at git.blender.org
Sat Feb 11 06:28:58 CET 2017


Commit: f7b1b87ba953ba9ae86ca9a70d6da66b6e0ea3f7
Author: Mike Erwin
Date:   Fri Feb 10 22:27:20 2017 -0500
Branches: blender2.8
https://developer.blender.org/rBf7b1b87ba953ba9ae86ca9a70d6da66b6e0ea3f7

Gawain: minor cleanup

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

M	source/blender/gpu/gawain/batch.c
M	source/blender/gpu/gawain/batch.h

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

diff --git a/source/blender/gpu/gawain/batch.c b/source/blender/gpu/gawain/batch.c
index 3ddc6c7f63..ecc653e5e7 100644
--- a/source/blender/gpu/gawain/batch.c
+++ b/source/blender/gpu/gawain/batch.c
@@ -253,7 +253,9 @@ void Batch_draw(Batch* batch)
 	glBindVertexArray(0);
 	}
 
-/* clement : temp stuff */
+
+
+// clement : temp stuff
 void Batch_draw_stupid(Batch* batch)
 {
 	if (batch->vao_id)
@@ -288,7 +290,7 @@ void Batch_draw_stupid(Batch* batch)
 	glBindVertexArray(0);
 }
 
-/* clement : temp stuff */
+// clement : temp stuff
 void Batch_draw_stupid_instanced(Batch* batch, unsigned int instance_vbo, int instance_count)
 {
 	if (batch->vao_id)
diff --git a/source/blender/gpu/gawain/batch.h b/source/blender/gpu/gawain/batch.h
index a328d64966..763c4c1c49 100644
--- a/source/blender/gpu/gawain/batch.h
+++ b/source/blender/gpu/gawain/batch.h
@@ -38,7 +38,7 @@ typedef struct Batch{
 } Batch;
 
 Batch* Batch_create(PrimitiveType, VertexBuffer*, ElementList*);
-void Batch_init(Batch* batch, PrimitiveType prim_type, VertexBuffer* verts, ElementList* elem);
+void Batch_init(Batch*, PrimitiveType, VertexBuffer*, ElementList*);
 
 void Batch_discard(Batch*); // verts & elem are not discarded
 void Batch_discard_all(Batch*); // including verts & elem
@@ -58,6 +58,9 @@ void Batch_Uniform3fv(Batch*, const char* name, const float data[3]);
 void Batch_Uniform4fv(Batch*, const char* name, const float data[4]);
 
 void Batch_draw(Batch*);
+
+
+// clement : temp stuff
 void Batch_draw_stupid(Batch* batch);
 void Batch_draw_stupid_instanced(Batch* batch, unsigned int instance_vbo, int instance_count);




More information about the Bf-blender-cvs mailing list