mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Add meta compute shader to resolve binary occlusion queries. 

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-11-19 16:05:25 +01:00 committed by Hans-Kristian Arntzen
parent 6886bb7f11
commit fdd0dbafe4
5 changed files with 100 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/vkd3d/meson.build
View File

@ -12,6 +12,7 @@ vkd3d_shaders =[
'shaders/cs_clear_uav_image_2d_uint.comp',
'shaders/cs_clear_uav_image_3d_float.comp',
'shaders/cs_clear_uav_image_3d_uint.comp',
'shaders/cs_resolve_binary_queries.comp',
'shaders/fs_copy_image_float.frag',

51
libs/vkd3d/meta.c
View File

@ -1070,6 +1070,51 @@ HRESULT vkd3d_meta_get_swapchain_pipeline(struct vkd3d_meta_ops *meta_ops,
return S_OK;
}
HRESULT vkd3d_query_ops_init(struct vkd3d_query_ops *meta_query_ops,
struct d3d12_device *device)
{
VkPushConstantRange push_constant_range;
VkDescriptorSetLayoutBinding binding;
VkResult vr;
binding.binding = 0;
binding.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
binding.descriptorCount = 1;
binding.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT;
binding.pImmutableSamplers = NULL;
push_constant_range.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT;
push_constant_range.offset = 0;
push_constant_range.size = sizeof(struct vkd3d_query_op_args);
if ((vr = vkd3d_meta_create_descriptor_set_layout(device, 1, &binding, &meta_query_ops->vk_set_layout)) < 0)
goto fail;
if ((vr = vkd3d_meta_create_pipeline_layout(device, 1, &meta_query_ops->vk_set_layout,
1, &push_constant_range, &meta_query_ops->vk_pipeline_layout)) < 0)
goto fail;
if ((vr = vkd3d_meta_create_compute_pipeline(device, sizeof(cs_resolve_binary_queries), cs_resolve_binary_queries,
meta_query_ops->vk_pipeline_layout, NULL, &meta_query_ops->vk_resolve_binary_pipeline)) < 0)
goto fail;
return S_OK;
fail:
vkd3d_query_ops_cleanup(meta_query_ops, device);
return hresult_from_vk_result(vr);
}
void vkd3d_query_ops_cleanup(struct vkd3d_query_ops *meta_query_ops,
struct d3d12_device *device)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, meta_query_ops->vk_set_layout, NULL));
VK_CALL(vkDestroyPipelineLayout(device->vk_device, meta_query_ops->vk_pipeline_layout, NULL));
VK_CALL(vkDestroyPipeline(device->vk_device, meta_query_ops->vk_resolve_binary_pipeline, NULL));
}
HRESULT vkd3d_meta_ops_init(struct vkd3d_meta_ops *meta_ops, struct d3d12_device *device)
{
HRESULT hr;
@ -1089,8 +1134,13 @@ HRESULT vkd3d_meta_ops_init(struct vkd3d_meta_ops *meta_ops, struct d3d12_device
if (FAILED(hr = vkd3d_swapchain_ops_init(&meta_ops->swapchain, device)))
goto fail_swapchain_ops;
if (FAILED(hr = vkd3d_query_ops_init(&meta_ops->query, device)))
goto fail_query_ops;
return S_OK;
fail_query_ops:
vkd3d_swapchain_ops_cleanup(&meta_ops->swapchain, device);
fail_swapchain_ops:
vkd3d_copy_image_ops_cleanup(&meta_ops->copy_image, device);
fail_copy_image_ops:
@ -1103,6 +1153,7 @@ fail_common:
HRESULT vkd3d_meta_ops_cleanup(struct vkd3d_meta_ops *meta_ops, struct d3d12_device *device)
{
vkd3d_query_ops_cleanup(&meta_ops->query, device);
vkd3d_swapchain_ops_cleanup(&meta_ops->swapchain, device);
vkd3d_copy_image_ops_cleanup(&meta_ops->copy_image, device);
vkd3d_clear_uav_ops_cleanup(&meta_ops->clear_uav, device);

26
libs/vkd3d/shaders/cs_resolve_binary_queries.comp Normal file
View File

@ -0,0 +1,26 @@
#version 450
layout(local_size_x = 64) in;
layout(binding = 0, std430)
buffer s_query_buffer_t {
uvec2 data[];
} s_query_buffer;
layout(push_constant)
uniform u_info_t {
uint query_offset;
uint query_count;
} u_info;
void main() {
uint thread_id = gl_GlobalInvocationID.x;
if (thread_id < u_info.query_count) {
uint query_id = u_info.query_offset + thread_id;
uvec2 query_data = s_query_buffer.data[query_id];
if (any(greaterThan(query_data, uvec2(1, 0))))
s_query_buffer.data[query_id] = uvec2(1, 0);
}
}

21
libs/vkd3d/vkd3d_private.h
View File

@ -1781,6 +1781,26 @@ HRESULT vkd3d_swapchain_ops_init(struct vkd3d_swapchain_ops *meta_swapchain_ops,
void vkd3d_swapchain_ops_cleanup(struct vkd3d_swapchain_ops *meta_swapchain_ops,
struct d3d12_device *device);
#define VKD3D_QUERY_OP_WORKGROUP_SIZE (64)
struct vkd3d_query_op_args
{
uint32_t query_offset;
uint32_t query_count;
};
struct vkd3d_query_ops
{
VkDescriptorSetLayout vk_set_layout;
VkPipelineLayout vk_pipeline_layout;
VkPipeline vk_resolve_binary_pipeline;
};
HRESULT vkd3d_query_ops_init(struct vkd3d_query_ops *meta_query_ops,
struct d3d12_device *device);
void vkd3d_query_ops_cleanup(struct vkd3d_query_ops *meta_query_ops,
struct d3d12_device *device);
struct vkd3d_meta_ops_common
{
VkShaderModule vk_module_fullscreen_vs;
@ -1794,6 +1814,7 @@ struct vkd3d_meta_ops
struct vkd3d_clear_uav_ops clear_uav;
struct vkd3d_copy_image_ops copy_image;
struct vkd3d_swapchain_ops swapchain;
struct vkd3d_query_ops query;
};
HRESULT vkd3d_meta_ops_init(struct vkd3d_meta_ops *meta_ops, struct d3d12_device *device);

1
libs/vkd3d/vkd3d_shaders.h
View File

@ -41,6 +41,7 @@ enum vkd3d_meta_copy_mode
#include <cs_clear_uav_image_2d_uint.h>
#include <cs_clear_uav_image_3d_float.h>
#include <cs_clear_uav_image_3d_uint.h>
#include <cs_resolve_binary_queries.h>
#include <vs_fullscreen_layer.h>
#include <vs_fullscreen.h>
#include <gs_fullscreen.h>