Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some issues reported by latest validation layers #385

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Fix some issues reported by latest validation layers #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/refresh/vkpt/path_tracer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,10 @@ typedef struct {
__VA_ARGS__ \
}; \
\
VkPipelineStageFlags blas_dst_stage = \
qvk.use_ray_query ? VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT : VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR; \
vkCmdPipelineBarrier(cmd_buf, VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR, \
VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, 0, 1, \
blas_dst_stage, 0, 1, \
&mem_barrier, 0, 0, 0, 0); \
} while(0)

Expand Down
4 changes: 2 additions & 2 deletions src/refresh/vkpt/precomputed_sky.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ vkpt_uniform_precomputed_buffer_create(void)
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);

ATTACH_LABEL_VARIABLE_NAME(atmosphere_params_buffer.buffer, IMAGE_VIEW, "AtmosphereParameters");
ATTACH_LABEL_VARIABLE_NAME(atmosphere_params_buffer.buffer, BUFFER, "AtmosphereParameters");
}

VkDescriptorPoolSize pool_size = {
Expand Down Expand Up @@ -883,7 +883,7 @@ void CreateShadowMap(struct Shadowmap* InOutShadowmap)
};

_VK(vkCreateImage(qvk.device, &ShadowTexInfo, NULL, &InOutShadowmap->TargetTexture));
ATTACH_LABEL_VARIABLE_NAME(InOutShadowmap->TargetTexture, IMAGE_VIEW, "EnvShadowMap");
ATTACH_LABEL_VARIABLE_NAME(InOutShadowmap->TargetTexture, IMAGE, "EnvShadowMap");

VkMemoryRequirements memReqs = {0};
vkGetImageMemoryRequirements(qvk.device, InOutShadowmap->TargetTexture, &memReqs);
Expand Down
3 changes: 2 additions & 1 deletion src/refresh/vkpt/vertex_buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,9 @@ static void build_model_blas(VkCommandBuffer cmd_buf, model_geometry_t* info, si
.dstAccessMask = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR
};

VkPipelineStageFlags blas_dst_stage = qvk.use_ray_query ? VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT : VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR;
vkCmdPipelineBarrier(cmd_buf, VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR,
VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, 0, 1,
blas_dst_stage, 0, 1,
&barrier, 0, 0, 0, 0);
}

Expand Down
Loading