diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-30 07:14:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-30 07:15:05 +0300 |
| commit | 543ddbe6bfa8072b4c09ccc9abe27237d3598db5 (patch) | |
| tree | 3d7ca08c1c16389e803721597817f11c53325523 /source/blender/draw | |
| parent | 266b1e2cdbc19466ac452cc3cb08273d6f37b341 (diff) | |
Cleanup: warnings (clang)
Diffstat (limited to 'source/blender/draw')
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_shaders.c b/source/blender/draw/engines/eevee/eevee_shaders.c index 6fbd0ae5173..29b30e7763e 100644 --- a/source/blender/draw/engines/eevee/eevee_shaders.c +++ b/source/blender/draw/engines/eevee/eevee_shaders.c @@ -33,7 +33,7 @@ #include "eevee_private.h" -const char *filter_defines = "#define HAMMERSLEY_SIZE " STRINGIFY(HAMMERSLEY_SIZE) "\n" +static const char *filter_defines = "#define HAMMERSLEY_SIZE " STRINGIFY(HAMMERSLEY_SIZE) "\n" #if defined(IRRADIANCE_SH_L2) "#define IRRADIANCE_SH_L2\n" #elif defined(IRRADIANCE_CUBEMAP) diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c index a4cd81e7fd2..408212f6814 100644 --- a/source/blender/draw/engines/workbench/workbench_volume.c +++ b/source/blender/draw/engines/workbench/workbench_volume.c @@ -52,7 +52,7 @@ static struct { struct GPUShader *volume_slice_coba_sh; struct GPUTexture *dummy_tex; struct GPUTexture *dummy_coba_tex; -} e_data = {NULL}; +} e_data = {{NULL}}; extern char datatoc_workbench_volume_vert_glsl[]; extern char datatoc_workbench_volume_frag_glsl[]; diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index ff4fb0c85f6..f0a147f17b1 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -2714,7 +2714,7 @@ GPUBatch *DRW_cache_bone_arrows_get(void) return SHC.drw_bone_arrows; } -const float staticSine[16] = { +static const float staticSine[16] = { 0.0f, 0.104528463268f, 0.207911690818f, 0.309016994375f, 0.406736643076f, 0.5f, 0.587785252292f, 0.669130606359f, 0.743144825477f, 0.809016994375f, 0.866025403784f, diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 30a940e27f6..9d9f7c47b14 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -268,7 +268,7 @@ typedef struct MeshRenderData { int *loose_verts; float (*poly_normals)[3]; - float (*vert_weight); + float *vert_weight; char (*vert_color)[3]; GPUPackedNormal *poly_normals_pack; GPUPackedNormal *vert_normals_pack; @@ -1422,7 +1422,7 @@ static float evaluate_vertex_weight(const MDeformVert *dvert, const DRW_MeshWeig /** Ensure #MeshRenderData.vert_weight */ static void mesh_render_data_ensure_vert_weight(MeshRenderData *rdata, const struct DRW_MeshWeightState *wstate) { - float (*vweight) = rdata->vert_weight; + float *vweight = rdata->vert_weight; if (vweight == NULL) { if (wstate->defgroup_active == -1) { goto fallback; @@ -3245,7 +3245,7 @@ static void mesh_create_weights(MeshRenderData *rdata, GPUVertBuf *vbo, DRW_Mesh const int vbo_len_capacity = mesh_render_data_verts_len_get_maybe_mapped(rdata); mesh_render_data_ensure_vert_weight(rdata, wstate); - const float (*vert_weight) = rdata->vert_weight; + const float *vert_weight = rdata->vert_weight; GPU_vertbuf_init_with_format(vbo, &format); /* Meh, another allocation / copy for no benefit. |