griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: GPU: Use functional cast for scalar casting

Browse Source
This commit is contained in:
Clément Foucault
2025-01-31 16:24:51 +01:00
parent adf5491c0b
commit 976ed42533
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/intern/gpu_shader_create_info.hh
View File

@@ -1024,14 +1024,14 @@ struct ShaderCreateInfo {
constant.name = name;
switch (type) {
case Type::INT:
constant.value.i = static_cast<int>(default_value);
constant.value.i = int(default_value);
break;
case Type::BOOL:
case Type::UINT:
constant.value.u = static_cast<uint>(default_value);
constant.value.u = uint(default_value);
break;
case Type::FLOAT:
constant.value.f = static_cast<float>(default_value);
constant.value.f = float(default_value);
break;
default:
BLI_assert_msg(0, "Only scalar types can be used as constants");

2
source/blender/gpu/metal/mtl_query.mm
View File

@@ -121,7 +121,7 @@ void MTLQueryPool::get_occlusion_result(MutableSpan<uint32_t> r_values)
int requested_buffer = i / VISIBILITY_COUNT_PER_BUFFER;
const uint64_t *queries = static_cast<const uint64_t *>(
buffer_[requested_buffer]->get_host_ptr());
r_values[i] = static_cast<uint32_t>(queries[i % VISIBILITY_COUNT_PER_BUFFER]);
r_values[i] = uint32_t(queries[i % VISIBILITY_COUNT_PER_BUFFER]);
}
ctx->set_visibility_buffer(nullptr);
}

14
source/blender/gpu/metal/mtl_texture.mm
View File

@@ -458,9 +458,8 @@ GPUFrameBuffer *gpu::MTLTexture::get_blit_framebuffer(int dst_slice, uint dst_mi
/* DEPTH TEX */
GPU_framebuffer_ensure_config(
&blit_fb_,
{GPU_ATTACHMENT_TEXTURE_LAYER_MIP(wrap(static_cast<Texture *>(this)),
static_cast<int>(dst_slice),
static_cast<int>(dst_mip)),
{GPU_ATTACHMENT_TEXTURE_LAYER_MIP(
wrap(static_cast<Texture *>(this)), int(dst_slice), int(dst_mip)),
GPU_ATTACHMENT_NONE});
}
else {
@@ -468,9 +467,8 @@ GPUFrameBuffer *gpu::MTLTexture::get_blit_framebuffer(int dst_slice, uint dst_mi
GPU_framebuffer_ensure_config(
&blit_fb_,
{GPU_ATTACHMENT_NONE,
GPU_ATTACHMENT_TEXTURE_LAYER_MIP(wrap(static_cast<Texture *>(this)),
static_cast<int>(dst_slice),
static_cast<int>(dst_mip))});
GPU_ATTACHMENT_TEXTURE_LAYER_MIP(
wrap(static_cast<Texture *>(this)), int(dst_slice), int(dst_mip))});
}
blit_fb_slice_ = dst_slice;
blit_fb_mip_ = dst_mip;
@@ -2078,7 +2076,7 @@ bool gpu::MTLTexture::init_internal(VertBuf *vbo)
size_t bytes_per_row = bytes_per_pixel * w_;
MTLContext *mtl_ctx = MTLContext::get();
uint32_t align_requirement = static_cast<uint32_t>(
uint32_t align_requirement = uint32_t(
[mtl_ctx->device minimumLinearTextureAlignmentForPixelFormat:mtl_format]);
/* If stride is larger than bytes per pixel, but format has multiple attributes,
@@ -2455,7 +2453,7 @@ void gpu::MTLTexture::ensure_baked()
/* Texture allocation with buffer as backing storage. Bytes per row must satisfy alignment
* rules for device. */
uint32_t align_requirement = static_cast<uint32_t>(
uint32_t align_requirement = uint32_t(
[ctx->device minimumLinearTextureAlignmentForPixelFormat:mtl_format]);
size_t aligned_bytes_per_row = ceil_to_multiple_ul(bytes_per_row, align_requirement);
texture_ = [backing_buffer_->get_metal_buffer()