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
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-02-11 06:27:20 +0300
committerMike Erwin <significant.bit@gmail.com>2017-02-11 06:27:20 +0300
commitf7b1b87ba953ba9ae86ca9a70d6da66b6e0ea3f7 (patch)
tree15cedb2fa3262080e505f36ec157e6c8b92d1596 /source/blender/gpu
parent1c09c8f32f129913c8a8544827adff63f4339a3c (diff)
Gawain: minor cleanup
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/gawain/batch.c6
-rw-r--r--source/blender/gpu/gawain/batch.h5
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/gpu/gawain/batch.c b/source/blender/gpu/gawain/batch.c
index 3ddc6c7f639..ecc653e5e7b 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 a328d649663..763c4c1c495 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);