griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Gawain: minor cleanup

Browse Source
This commit is contained in:
Mike Erwin
2017-02-10 22:27:20 -05:00
parent 1c09c8f32f
commit f7b1b87ba9
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/gawain/batch.c
View File

@@ -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)

5
source/blender/gpu/gawain/batch.h
View File

@@ -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);