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

vkd3d: Move vkd3d_view_key to private header. 

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2020-10-06 11:10:56 +02:00
parent 70af36a6e2
commit 44977b63b2
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/vkd3d/resource.c
View File

@ -1418,17 +1418,6 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device,
return hr;
}
struct vkd3d_view_key
{
enum vkd3d_view_type view_type;
union
{
struct vkd3d_buffer_view_desc buffer;
struct vkd3d_texture_view_desc texture;
D3D12_SAMPLER_DESC sampler;
} u;
};
struct vkd3d_view_entry
{
struct hash_map_entry entry;
@ -1585,7 +1574,7 @@ static struct vkd3d_view *vkd3d_view_create(enum vkd3d_view_type type);
static HRESULT d3d12_create_sampler(struct d3d12_device *device,
const D3D12_SAMPLER_DESC *desc, VkSampler *vk_sampler);
static struct vkd3d_view *vkd3d_view_map_create_view(struct vkd3d_view_map *view_map,
struct vkd3d_view *vkd3d_view_map_create_view(struct vkd3d_view_map *view_map,
struct d3d12_device *device, const struct vkd3d_view_key *key)
{
struct vkd3d_view_entry entry, *e;

13
libs/vkd3d/vkd3d_private.h
View File

@ -2108,4 +2108,17 @@ VkDeviceAddress vkd3d_get_buffer_device_address(struct d3d12_device *device, VkB
#define VKD3D_NULL_BUFFER_SIZE 16
struct vkd3d_view_key
{
enum vkd3d_view_type view_type;
union
{
struct vkd3d_buffer_view_desc buffer;
struct vkd3d_texture_view_desc texture;
D3D12_SAMPLER_DESC sampler;
} u;
};
struct vkd3d_view *vkd3d_view_map_create_view(struct vkd3d_view_map *view_map,
struct d3d12_device *device, const struct vkd3d_view_key *key);
#endif /* __VKD3D_PRIVATE_H */