wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Store vkd3d_format in {dsv,rtv}_desc.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia
2019-07-30 11:40:30 +02:00
committed by Alexandre Julliard
parent 49391ecf2d
commit d9da1c904e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d/command.c
View File

@@ -4456,7 +4456,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_width = max(list->fb_width, dsv_desc->width);
list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_height = max(list->fb_height, dsv_desc->height);
list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count);
list->dsv_format = dsv_desc->format; list->dsv_format = dsv_desc->format->vk_format;
} }
else else
{ {
@@ -4595,7 +4595,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra
d3d12_command_list_track_resource_usage(list, dsv_desc->resource); d3d12_command_list_track_resource_usage(list, dsv_desc->resource);
attachment_desc.flags = 0; attachment_desc.flags = 0;
attachment_desc.format = dsv_desc->format; attachment_desc.format = dsv_desc->format->vk_format;
attachment_desc.samples = dsv_desc->sample_count; attachment_desc.samples = dsv_desc->sample_count;
if (flags & D3D12_CLEAR_FLAG_DEPTH) if (flags & D3D12_CLEAR_FLAG_DEPTH)
{ {
@@ -4643,7 +4643,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra
d3d12_command_list_track_resource_usage(list, rtv_desc->resource); d3d12_command_list_track_resource_usage(list, rtv_desc->resource);
attachment_desc.flags = 0; attachment_desc.flags = 0;
attachment_desc.format = rtv_desc->format; attachment_desc.format = rtv_desc->format->vk_format;
attachment_desc.samples = rtv_desc->sample_count; attachment_desc.samples = rtv_desc->sample_count;
attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE; attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE;

4
libs/vkd3d/resource.c
View File

@@ -2827,8 +2827,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev
return; return;
rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV;
rtv_desc->format = vkd3d_desc.format->vk_format;
rtv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); rtv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc);
rtv_desc->format = vkd3d_desc.format;
rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx);
rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx);
rtv_desc->layer_count = vkd3d_desc.layer_count; rtv_desc->layer_count = vkd3d_desc.layer_count;
@@ -2910,8 +2910,8 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev
return; return;
dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV;
dsv_desc->format = vkd3d_desc.format->vk_format;
dsv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); dsv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc);
dsv_desc->format = vkd3d_desc.format;
dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx);
dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx);
dsv_desc->layer_count = vkd3d_desc.layer_count; dsv_desc->layer_count = vkd3d_desc.layer_count;

4
libs/vkd3d/vkd3d_private.h
View File

@@ -518,8 +518,8 @@ HRESULT vkd3d_create_static_sampler(struct d3d12_device *device,
struct d3d12_rtv_desc struct d3d12_rtv_desc
{ {
uint32_t magic; uint32_t magic;
VkFormat format;
VkSampleCountFlagBits sample_count; VkSampleCountFlagBits sample_count;
const struct vkd3d_format *format;
uint64_t width; uint64_t width;
unsigned int height; unsigned int height;
unsigned int layer_count; unsigned int layer_count;
@@ -538,8 +538,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev
struct d3d12_dsv_desc struct d3d12_dsv_desc
{ {
uint32_t magic; uint32_t magic;
VkFormat format;
VkSampleCountFlagBits sample_count; VkSampleCountFlagBits sample_count;
const struct vkd3d_format *format;
uint64_t width; uint64_t width;
unsigned int height; unsigned int height;
unsigned int layer_count; unsigned int layer_count;