diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-15 16:27:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-15 16:34:13 +0300 |
commit | 57ab7daa2aee436b0b0acfa00b2e2b1d28b55b2c (patch) | |
tree | 377218e81452e4e0d3f8ca3cf3c3ac5148f237b8 /intern | |
parent | b457cae397054a1be4e60f3007995f97c198b2b6 (diff) |
GPU_matrix: use Blender's naming conventions
Thanks to @sergey for review
Diffstat (limited to 'intern')
-rw-r--r-- | intern/gawain/gawain/gwn_batch.h | 2 | ||||
-rw-r--r-- | intern/gawain/src/gwn_batch.c | 4 | ||||
-rw-r--r-- | intern/gawain/src/gwn_immediate.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/intern/gawain/gawain/gwn_batch.h b/intern/gawain/gawain/gwn_batch.h index cf7b0c9f1b5..734df3c91b6 100644 --- a/intern/gawain/gawain/gwn_batch.h +++ b/intern/gawain/gawain/gwn_batch.h @@ -119,7 +119,7 @@ void GWN_batch_uniform_mat4(Gwn_Batch*, const char* name, const float data[4][4] void GWN_batch_draw(Gwn_Batch*); -// This does not bind/unbind shader and does not call gpuBindMatrices() +// This does not bind/unbind shader and does not call GPU_matrix_bind() void GWN_batch_draw_range_ex(Gwn_Batch*, int v_first, int v_count, bool force_instance); // Does not even need batch diff --git a/intern/gawain/src/gwn_batch.c b/intern/gawain/src/gwn_batch.c index 62342cfc42f..4979d93b15e 100644 --- a/intern/gawain/src/gwn_batch.c +++ b/intern/gawain/src/gwn_batch.c @@ -18,7 +18,7 @@ #include <string.h> // necessary functions from matrix API -extern void gpuBindMatrices(const Gwn_ShaderInterface* shaderface); +extern void GPU_matrix_bind(const Gwn_ShaderInterface* shaderface); static void batch_update_program_bindings(Gwn_Batch* batch, unsigned int v_first); @@ -537,7 +537,7 @@ void GWN_batch_draw(Gwn_Batch* batch) assert(batch->verts[0]->vbo_id != 0); #endif GWN_batch_program_use_begin(batch); - gpuBindMatrices(batch->interface); // external call. + GPU_matrix_bind(batch->interface); // external call. GWN_batch_draw_range_ex(batch, 0, 0, false); diff --git a/intern/gawain/src/gwn_immediate.c b/intern/gawain/src/gwn_immediate.c index d43e52cc525..f6760b0e9da 100644 --- a/intern/gawain/src/gwn_immediate.c +++ b/intern/gawain/src/gwn_immediate.c @@ -19,8 +19,8 @@ #include <string.h> // necessary functions from matrix API -extern void gpuBindMatrices(const Gwn_ShaderInterface*); -extern bool gpuMatricesDirty(void); +extern void GPU_matrix_bind(const Gwn_ShaderInterface*); +extern bool GPU_matrix_dirty_get(void); typedef struct { // TODO: organize this struct by frequency of change (run-time) @@ -129,7 +129,7 @@ void immBindProgram(GLuint program, const Gwn_ShaderInterface* shaderface) glUseProgram(program); get_attrib_locations(&imm.vertex_format, &imm.attrib_binding, shaderface); - gpuBindMatrices(shaderface); + GPU_matrix_bind(shaderface); } void immUnbindProgram(void) @@ -341,8 +341,8 @@ static void immDrawSetup(void) } } - if (gpuMatricesDirty()) - gpuBindMatrices(imm.shader_interface); + if (GPU_matrix_dirty_get()) + GPU_matrix_bind(imm.shader_interface); } void immEnd(void) |