From 891949cbb47143420f4324cb60efc05ef5d70b39 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 25 Sep 2022 17:04:52 +1000 Subject: Cleanup: use 'u' prefixed integer types for brevity & cast style To use function style cast '(unsigned char)x' can't be replaced by 'unsigned char(x)'. --- source/blender/draw/intern/draw_cache_impl_subdivision.cc | 4 ++-- source/blender/draw/intern/draw_instance_data.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/draw') diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index d4b3e392113..8492804775e 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -361,14 +361,14 @@ static GPUVertFormat *get_subdiv_vertex_format() struct CompressedPatchCoord { int ptex_face_index; /* UV coordinate encoded as u << 16 | v, where u and v are quantized on 16-bits. */ - unsigned int encoded_uv; + uint encoded_uv; }; MINLINE CompressedPatchCoord make_patch_coord(int ptex_face_index, float u, float v) { CompressedPatchCoord patch_coord = { ptex_face_index, - (static_cast(u * 65535.0f) << 16) | static_cast(v * 65535.0f), + (static_cast(u * 65535.0f) << 16) | static_cast(v * 65535.0f), }; return patch_coord; } diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c index ac2aea4524d..7ed5ca7c983 100644 --- a/source/blender/draw/intern/draw_instance_data.c +++ b/source/blender/draw/intern/draw_instance_data.c @@ -410,12 +410,12 @@ typedef struct DRWSparseUniformBuf { BLI_bitmap *chunk_used; int num_chunks; - unsigned int item_size, chunk_size, chunk_bytes; + uint item_size, chunk_size, chunk_bytes; } DRWSparseUniformBuf; static void drw_sparse_uniform_buffer_init(DRWSparseUniformBuf *buffer, - unsigned int item_size, - unsigned int chunk_size) + uint item_size, + uint chunk_size) { buffer->chunk_buffers = NULL; buffer->chunk_used = NULL; @@ -426,7 +426,7 @@ static void drw_sparse_uniform_buffer_init(DRWSparseUniformBuf *buffer, buffer->chunk_bytes = item_size * chunk_size; } -DRWSparseUniformBuf *DRW_sparse_uniform_buffer_new(unsigned int item_size, unsigned int chunk_size) +DRWSparseUniformBuf *DRW_sparse_uniform_buffer_new(uint item_size, uint chunk_size) { DRWSparseUniformBuf *buf = MEM_mallocN(sizeof(DRWSparseUniformBuf), __func__); drw_sparse_uniform_buffer_init(buf, item_size, chunk_size); -- cgit v1.2.3