Skip to content

Commit f0e9717

Browse files
committed
Merge branch 'vulkan-validation-error-fixes' into master-lange-studios
2 parents 8e028c8 + 7b11a59 commit f0e9717

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

drivers/vulkan/rendering_device_driver_vulkan.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ static VkPipelineStageFlags _rd_to_vk_pipeline_stages(BitField<RDD::PipelineStag
298298
if (p_stages.has_flag(RDD::PIPELINE_STAGE_COPY_BIT) || p_stages.has_flag(RDD::PIPELINE_STAGE_RESOLVE_BIT)) {
299299
// Transfer has been split into copy and resolve bits. Clear them and merge them into one bit.
300300
vk_flags |= VK_PIPELINE_STAGE_TRANSFER_BIT;
301+
vk_flags |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
301302
p_stages.clear_flag(RDD::PIPELINE_STAGE_COPY_BIT);
302303
p_stages.clear_flag(RDD::PIPELINE_STAGE_RESOLVE_BIT);
303304
}

servers/rendering/renderer_rd/storage_rd/material_storage.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -2344,6 +2344,7 @@ MaterialStorage::Samplers MaterialStorage::samplers_rd_allocate(float p_mipmap_b
23442344
sampler_state.mag_filter = RD::SAMPLER_FILTER_LINEAR;
23452345
sampler_state.min_filter = RD::SAMPLER_FILTER_LINEAR;
23462346
sampler_state.max_lod = 0;
2347+
sampler_state.enable_compare = true;
23472348
} break;
23482349
case RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS: {
23492350
sampler_state.mag_filter = RD::SAMPLER_FILTER_NEAREST;

0 commit comments

Comments
 (0)