tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: Compiler warnings

This commit is contained in:
Brecht Van Lommel 2024-02-05 12:55:23 +01:00
parent c4e077341e
commit c14e9fc95b
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/nodes/COM_KuwaharaNode.cc
View File

@ -2,6 +2,8 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#define DNA_DEPRECATED_ALLOW /* For copy of deprecated NodeKuwaharaData members. */
#include "DNA_node_types.h"
#include "DNA_scene_types.h"

10
source/blender/gpu/vulkan/vk_command_buffers.cc
View File

@ -235,6 +235,10 @@ void VKCommandBuffers::bind(const VKPipeline &vk_pipeline, VkPipelineBindPoint b
else if (bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS) {
type = Type::Graphics;
}
else {
BLI_assert_unreachable();
return;
}
VKCommandBuffer &command_buffer = command_buffer_get(type);
vkCmdBindPipeline(command_buffer.vk_command_buffer(), bind_point, vk_pipeline.vk_handle());
@ -250,9 +254,13 @@ void VKCommandBuffers::bind(const VKDescriptorSet &descriptor_set,
ensure_no_draw_commands();
type = Type::DataTransferCompute;
}
if (bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS) {
else if (bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS) {
type = Type::Graphics;
}
else {
BLI_assert_unreachable();
return;
}
VKCommandBuffer &command_buffer = command_buffer_get(type);
VkDescriptorSet vk_descriptor_set = descriptor_set.vk_handle();

3
source/blender/gpu/vulkan/vk_data_conversion.cc
View File

@ -767,7 +767,8 @@ template<typename StorageType> void convert(F32 &dst, const UnsignedNormalized<S
dst.value = float(uint32_t(src.value)) / float(scalar);
}
template<typename StorageType> void convert(UnsignedNormalized<StorageType> &dst, const UI32 &src)
template<typename StorageType>
void convert(UnsignedNormalized<StorageType> & /*dst*/, const UI32 &src)
{
BLI_assert_unreachable();
}

7
source/blender/io/usd/intern/usd_reader_material.cc
View File

@ -686,10 +686,7 @@ struct IntermediateNode {
const char *sock_output_name;
};
static IntermediateNode add_normal_map(const pxr::UsdShadeShader &usd_shader,
bNodeTree *ntree,
int column,
NodePlacementContext *r_ctx)
static IntermediateNode add_normal_map(bNodeTree *ntree, int column, NodePlacementContext *r_ctx)
{
float locx = 0.0f;
float locy = 0.0f;
@ -825,7 +822,7 @@ bool USDMaterialReader::follow_connection(const pxr::UsdShadeInput &usd_input,
IntermediateNode normal_map{};
const bool is_normal_map = STREQ(dest_socket_name, "Normal");
if (is_normal_map) {
normal_map = add_normal_map(source_shader, ntree, column + shift, r_ctx);
normal_map = add_normal_map(ntree, column + shift, r_ctx);
shift++;
}