diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-04-20 19:10:00 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-04-20 19:29:33 +0300 |
commit | 358dfe6ac9f22eb59302f5a04b14b75beadf064c (patch) | |
tree | 01d8878bf3e086f00ab9c2e786bf97d39d8649dc /source/blender/draw/intern/draw_manager_data.c | |
parent | 9c274b0d5282e035f6cf1974f8bf7d0f351e31e3 (diff) |
DRW: Cleanup: Make DRW_shgroup_uniform_mat4 uniform expect float (*)[4]
Same thing for mat3.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_data.c')
-rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 74f39cf9073..31f6108f7e0 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -201,14 +201,14 @@ void DRW_shgroup_uniform_ivec3(DRWShadingGroup *shgroup, const char *name, const drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_INT, value, 3, arraysize); } -void DRW_shgroup_uniform_mat3(DRWShadingGroup *shgroup, const char *name, const float *value) +void DRW_shgroup_uniform_mat3(DRWShadingGroup *shgroup, const char *name, const float (*value)[3]) { - drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_FLOAT, value, 9, 1); + drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_FLOAT, (float *)value, 9, 1); } -void DRW_shgroup_uniform_mat4(DRWShadingGroup *shgroup, const char *name, const float *value) +void DRW_shgroup_uniform_mat4(DRWShadingGroup *shgroup, const char *name, const float (*value)[4]) { - drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_FLOAT, value, 16, 1); + drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_FLOAT, (float *)value, 16, 1); } /* Stores the int instead of a pointer. */ @@ -637,10 +637,10 @@ static DRWShadingGroup *drw_shgroup_material_inputs(DRWShadingGroup *grp, struct /* Should already be in the material ubo. */ break; case GPU_MAT3: - DRW_shgroup_uniform_mat3(grp, input->shadername, (float *)input->dynamicvec); + DRW_shgroup_uniform_mat3(grp, input->shadername, (float (*)[3])input->dynamicvec); break; case GPU_MAT4: - DRW_shgroup_uniform_mat4(grp, input->shadername, (float *)input->dynamicvec); + DRW_shgroup_uniform_mat4(grp, input->shadername, (float (*)[4])input->dynamicvec); break; default: break; |