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

Cleanup: use function style integer casts, modernize headers

Browse Source
This commit is contained in:
Campbell Barton
2023-09-05 11:02:56 +10:00
parent 0c26c84704
commit bedfc68e3f
7 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/ghost/intern/GHOST_ContextVK.cc
View File

@@ -229,13 +229,13 @@ class GHOST_DeviceVK {
VkDeviceCreateInfo device_create_info = {};
device_create_info.pNext = &maintenance_4;
device_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
device_create_info.queueCreateInfoCount = static_cast<uint32_t>(queue_create_infos.size());
device_create_info.queueCreateInfoCount = uint32_t(queue_create_infos.size());
device_create_info.pQueueCreateInfos = queue_create_infos.data();
/* layers_enabled are the same as instance extensions.
* This is only needed for 1.0 implementations. */
device_create_info.enabledLayerCount = static_cast<uint32_t>(layers_enabled.size());
device_create_info.enabledLayerCount = uint32_t(layers_enabled.size());
device_create_info.ppEnabledLayerNames = layers_enabled.data();
device_create_info.enabledExtensionCount = static_cast<uint32_t>(extensions_device.size());
device_create_info.enabledExtensionCount = uint32_t(extensions_device.size());
device_create_info.ppEnabledExtensionNames = extensions_device.data();
device_create_info.pEnabledFeatures = &device_features;
@@ -947,9 +947,9 @@ GHOST_TSuccess GHOST_ContextVK::initializeDrawingContext()
VkInstanceCreateInfo create_info = {};
create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
create_info.pApplicationInfo = &app_info;
create_info.enabledLayerCount = static_cast<uint32_t>(layers_enabled.size());
create_info.enabledLayerCount = uint32_t(layers_enabled.size());
create_info.ppEnabledLayerNames = layers_enabled.data();
create_info.enabledExtensionCount = static_cast<uint32_t>(extensions_enabled.size());
create_info.enabledExtensionCount = uint32_t(extensions_enabled.size());
create_info.ppEnabledExtensionNames = extensions_enabled.data();
VK_CHECK(vkCreateInstance(&create_info, nullptr, &instance));
}

2
source/blender/editors/armature/armature_utils.cc
View File

@@ -33,7 +33,7 @@
#include "armature_intern.h"
#include <string.h>
#include <cstring>
/* -------------------------------------------------------------------- */
/** \name Validation

2
source/blender/editors/armature/bone_collections.cc
View File

@@ -7,7 +7,7 @@
* Implementation of Bone Collection operators and editing API's.
*/
#include <string.h>
#include <cstring>
#include "ANIM_bone_collections.h"

4
source/blender/gpu/vulkan/vk_debug.cc
View File

@@ -229,8 +229,8 @@ void VKDebuggingTools::print_labels(const VkDebugUtilsMessengerCallbackDataEXT *
std::stringstream ss;
for (uint32_t object = 0; object < callback_data->objectCount; ++object) {
ss << " - ObjectType[" << to_string(callback_data->pObjects[object].objectType) << "],";
ss << "Handle[0x" << std::hex
<< static_cast<uintptr_t>(callback_data->pObjects[object].objectHandle) << "]";
ss << "Handle[0x" << std::hex << uintptr_t(callback_data->pObjects[object].objectHandle)
<< "]";
if (callback_data->pObjects[object].pObjectName) {
ss << ",Name[" << callback_data->pObjects[object].pObjectName << "]";
}

13
source/blender/gpu/vulkan/vk_pipeline_state.cc
View File

@@ -301,12 +301,11 @@ void VKPipelineStateManager::set_stencil_test(const eGPUStencilTest test,
void VKPipelineStateManager::set_stencil_mask(const eGPUStencilTest test,
const GPUStateMutable &mutable_state)
{
depth_stencil_state.front.writeMask = static_cast<uint32_t>(mutable_state.stencil_write_mask);
depth_stencil_state.front.reference = static_cast<uint32_t>(mutable_state.stencil_reference);
depth_stencil_state.front.writeMask = uint32_t(mutable_state.stencil_write_mask);
depth_stencil_state.front.reference = uint32_t(mutable_state.stencil_reference);
depth_stencil_state.front.compareOp = VK_COMPARE_OP_ALWAYS;
depth_stencil_state.front.compareMask = static_cast<uint32_t>(
mutable_state.stencil_compare_mask);
depth_stencil_state.front.compareMask = uint32_t(mutable_state.stencil_compare_mask);
switch (test) {
case GPU_STENCIL_NEQUAL:
@@ -367,9 +366,9 @@ void VKPipelineStateManager::set_shadow_bias(const bool enable)
{
if (enable) {
rasterization_state.depthBiasEnable = VK_TRUE;
rasterization_state.depthBiasSlopeFactor = 2.f;
rasterization_state.depthBiasConstantFactor = 1.f;
rasterization_state.depthBiasClamp = 0.f;
rasterization_state.depthBiasSlopeFactor = 2.0f;
rasterization_state.depthBiasConstantFactor = 1.0f;
rasterization_state.depthBiasClamp = 0.0f;
}
else {
rasterization_state.depthBiasEnable = VK_FALSE;

2
source/blender/gpu/vulkan/vk_shader.cc
View File

@@ -334,7 +334,7 @@ static void print_resource(std::ostream &os,
const VKDescriptorSet::Location location,
const ShaderCreateInfo::Resource &res)
{
os << "layout(binding = " << static_cast<uint32_t>(location);
os << "layout(binding = " << uint32_t(location);
if (res.bind_type == ShaderCreateInfo::Resource::BindType::IMAGE) {
os << ", " << to_string(res.image.format);
}

3
source/blender/sequencer/intern/sound.cc
View File

@@ -9,8 +9,7 @@
*/
#include <cmath>
#include <math.h>
#include <string.h>
#include <cstring>
#include "MEM_guardedalloc.h"