diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-25 11:30:50 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-25 11:31:10 +0300 |
commit | c7b247a118e302a3afc6473797e53b6af28b69e2 (patch) | |
tree | d11149a165bfd8f3b3b791f24547499f041b133b /source/blender/draw | |
parent | 891949cbb47143420f4324cb60efc05ef5d70b39 (diff) |
Cleanup: replace static_casts with functional casts for numeric types
Diffstat (limited to 'source/blender/draw')
5 files changed, 12 insertions, 15 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.cc b/source/blender/draw/engines/overlay/overlay_edit_uv.cc index 7425c577897..dd29a128255 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_uv.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_uv.cc @@ -335,9 +335,8 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata) char text[16]; LISTBASE_FOREACH (ImageTile *, tile, &image->tiles) { BLI_snprintf(text, 5, "%d", tile->tile_number); - float tile_location[3] = {static_cast<float>((tile->tile_number - 1001) % 10), - static_cast<float>((tile->tile_number - 1001) / 10), - 0.0f}; + float tile_location[3] = { + float((tile->tile_number - 1001) % 10), float((tile->tile_number - 1001) / 10), 0.0f}; DRW_text_cache_add( dt, tile_location, text, strlen(text), 10, 10, DRW_TEXT_CACHE_GLOBALSPACE, color); } @@ -372,8 +371,7 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata) float size_image[2]; BKE_image_get_size_fl(image, nullptr, size_image); - float size_stencil_image[2] = {static_cast<float>(stencil_ibuf->x), - static_cast<float>(stencil_ibuf->y)}; + float size_stencil_image[2] = {float(stencil_ibuf->x), float(stencil_ibuf->y)}; float obmat[4][4]; unit_m4(obmat); diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.cc b/source/blender/draw/intern/draw_cache_extract_mesh.cc index b1d1631cb6d..79f2982ab65 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh.cc @@ -110,7 +110,7 @@ class ExtractorRunDatas : public Vector<ExtractorRunData> { uint iter_types_len() const { const eMRIterType iter_type = iter_types(); - uint bits = static_cast<uint>(iter_type); + uint bits = uint(iter_type); return count_bits_i(bits); } diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index 8492804775e..c387a47f0a6 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -368,7 +368,7 @@ MINLINE CompressedPatchCoord make_patch_coord(int ptex_face_index, float u, floa { CompressedPatchCoord patch_coord = { ptex_face_index, - (static_cast<uint>(u * 65535.0f) << 16) | static_cast<uint>(v * 65535.0f), + (uint(u * 65535.0f) << 16) | uint(v * 65535.0f), }; return patch_coord; } @@ -1295,7 +1295,7 @@ static void drw_subdiv_compute_dispatch(const DRWSubdivCache *cache, uint total_dispatch_size, const bool has_sculpt_mask = false) { - const uint max_res_x = static_cast<uint>(GPU_max_work_group_count(0)); + const uint max_res_x = uint(GPU_max_work_group_count(0)); const uint dispatch_size = get_dispatch_size(total_dispatch_size); uint dispatch_rx = dispatch_size; @@ -2231,13 +2231,13 @@ void DRW_subdivide_loose_geom(DRWSubdivCache *subdiv_cache, MeshBufferCache *cac blender::Span<DRWSubdivLooseEdge> draw_subdiv_cache_get_loose_edges(const DRWSubdivCache *cache) { - return {cache->loose_geom.edges, static_cast<int64_t>(cache->loose_geom.edge_len)}; + return {cache->loose_geom.edges, int64_t(cache->loose_geom.edge_len)}; } blender::Span<DRWSubdivLooseVertex> draw_subdiv_cache_get_loose_verts(const DRWSubdivCache *cache) { return {cache->loose_geom.verts + cache->loose_geom.edge_len * 2, - static_cast<int64_t>(cache->loose_geom.vert_len)}; + int64_t(cache->loose_geom.vert_len)}; } static OpenSubdiv_EvaluatorCache *g_evaluator_cache = nullptr; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc index 9c564c2cdda..6b7d42ec67c 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc @@ -231,8 +231,7 @@ static void extract_lines_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, } GPUIndexBuf *ibo = static_cast<GPUIndexBuf *>(buffer); - draw_subdiv_build_lines_loose_buffer( - subdiv_cache, ibo, flags, static_cast<uint>(loose_geom.edge_len)); + draw_subdiv_build_lines_loose_buffer(subdiv_cache, ibo, flags, uint(loose_geom.edge_len)); GPU_vertbuf_discard(flags); } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc index 64ade020418..240e9b4fa60 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc @@ -285,7 +285,7 @@ static void extract_attr_init( GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); - init_vbo_for_attribute(*mr, vbo, request, false, static_cast<uint32_t>(mr->loop_len)); + init_vbo_for_attribute(*mr, vbo, request, false, uint32_t(mr->loop_len)); /* TODO(@kevindietrich): float3 is used for scalar attributes as the implicit conversion done by * OpenGL to vec4 for a scalar `s` will produce a `vec4(s, 0, 0, 1)`. However, following the @@ -340,7 +340,7 @@ static void extract_attr_init_subdiv(const DRWSubdivCache *subdiv_cache, GPUVertFormat coarse_format = {0}; GPU_vertformat_attr_add(&coarse_format, "data", GPU_COMP_F32, dimensions, GPU_FETCH_FLOAT); GPU_vertbuf_init_with_format_ex(src_data, &coarse_format, GPU_USAGE_STATIC); - GPU_vertbuf_data_alloc(src_data, static_cast<uint32_t>(coarse_mesh->totloop)); + GPU_vertbuf_data_alloc(src_data, uint32_t(coarse_mesh->totloop)); switch (request.cd_type) { case CD_PROP_BOOL: @@ -379,7 +379,7 @@ static void extract_attr_init_subdiv(const DRWSubdivCache *subdiv_cache, draw_subdiv_interp_custom_data(subdiv_cache, src_data, dst_buffer, - static_cast<int>(dimensions), + int(dimensions), 0, ELEM(request.cd_type, CD_PROP_COLOR, CD_PROP_BYTE_COLOR)); |