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

vkd3d: Create NULL sampler. 

Defaults taken from D3D11.

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-03-05 12:19:58 +01:00 committed by Hans-Kristian Arntzen
parent 8fc2fb9842
commit 598afec8ea
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d/resource.c
View File

@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <float.h>
#include "vkd3d_private.h"
#define VKD3D_NULL_BUFFER_SIZE 16
@ -4098,6 +4100,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,
const bool use_sparse_resources = device->vk_info.sparse_properties.residencyNonResidentStrict;
D3D12_HEAP_PROPERTIES heap_properties;
D3D12_RESOURCE_DESC resource_desc;
VkResult vr;
HRESULT hr;
TRACE("Creating resources for NULL views.\n");
@ -4196,6 +4199,15 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,
&null_resources->vk_2d_storage_image_view))
goto fail;
/* Sampler */
if ((vr = d3d12_create_sampler(device, D3D12_FILTER_MIN_MAG_MIP_LINEAR,
D3D12_TEXTURE_ADDRESS_MODE_CLAMP, D3D12_TEXTURE_ADDRESS_MODE_CLAMP, D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
0.0f, 1, D3D12_COMPARISON_FUNC_ALWAYS, -FLT_MAX, FLT_MAX, &null_resources->vk_sampler)))
{
hr = hresult_from_vk_result(vr);
goto fail;
}
/* set Vulkan object names */
vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_buffer,
VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL buffer");
@ -4217,6 +4229,8 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,
VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D UAV image");
vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image_view,
VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT, "NULL 2D UAV image view");
vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_sampler,
VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT, "NULL sampler");
if (!use_sparse_resources)
{
vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer_memory,
@ -4254,5 +4268,7 @@ void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources,
VK_CALL(vkDestroyImage(device->vk_device, null_resources->vk_2d_storage_image, NULL));
VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_2d_storage_image_memory, NULL));
VK_CALL(vkDestroySampler(device->vk_device, null_resources->vk_sampler, NULL));
memset(null_resources, 0, sizeof(*null_resources));
}

2
libs/vkd3d/vkd3d_private.h
View File

@ -1061,6 +1061,8 @@ struct vkd3d_null_resources
VkImage vk_2d_storage_image;
VkImageView vk_2d_storage_image_view;
VkDeviceMemory vk_2d_storage_image_memory;
VkSampler vk_sampler;
};
HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,