Merged pull request "Fix some issues reported by latest validation la…

…yers": #385
NVIDIA · Mar 26, 2024 · 1c2fd65 · 1c2fd65
2 parents aab37ec + 257594d
commit 1c2fd65
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/refresh/vkpt/path_tracer.c b/src/refresh/vkpt/path_tracer.c
@@ -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)
 

diff --git a/src/refresh/vkpt/precomputed_sky.c b/src/refresh/vkpt/precomputed_sky.c
@@ -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 = {
@@ -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);

diff --git a/src/refresh/vkpt/vertex_buffer.c b/src/refresh/vkpt/vertex_buffer.c
@@ -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);
 }