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

vkd3d: Encode in detail which commands we're emitting in template. 

Feed this back to debug ring for less cryptic logs.

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2022-02-18 14:25:37 +01:00
parent 96fdb71ae4
commit e138a5117a
4 changed files with 70 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libs/vkd3d/command.c
View File

@ -12921,6 +12921,7 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
struct d3d12_root_signature *root_signature,
struct d3d12_device *device)
{
const enum vkd3d_patch_command_token *generic_u32_copy_types;
const struct vkd3d_shader_root_parameter *root_parameter;
const struct vkd3d_shader_root_constant *root_constant;
struct vkd3d_patch_command *patch_commands = NULL;
@ -12940,6 +12941,46 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
HRESULT hr = S_OK;
uint32_t i, j;
/* Mostly for debug. Lets debug ring report what it is writing easily. */
static const enum vkd3d_patch_command_token ibv_types[] =
{
VKD3D_PATCH_COMMAND_TOKEN_COPY_IBO_VA_LO,
VKD3D_PATCH_COMMAND_TOKEN_COPY_IBO_VA_HI,
VKD3D_PATCH_COMMAND_TOKEN_COPY_IBO_SIZE,
VKD3D_PATCH_COMMAND_TOKEN_COPY_INDEX_FORMAT,
};
static const enum vkd3d_patch_command_token vbv_types[] =
{
VKD3D_PATCH_COMMAND_TOKEN_COPY_VBO_VA_LO,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VBO_VA_HI,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VBO_SIZE,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VBO_STRIDE,
};
static const enum vkd3d_patch_command_token draw_types[] =
{
VKD3D_PATCH_COMMAND_TOKEN_COPY_VERTEX_COUNT,
VKD3D_PATCH_COMMAND_TOKEN_COPY_INSTANCE_COUNT,
VKD3D_PATCH_COMMAND_TOKEN_COPY_FIRST_VERTEX,
VKD3D_PATCH_COMMAND_TOKEN_COPY_FIRST_INSTANCE,
};
static const enum vkd3d_patch_command_token draw_indexed_types[] =
{
VKD3D_PATCH_COMMAND_TOKEN_COPY_INDEX_COUNT,
VKD3D_PATCH_COMMAND_TOKEN_COPY_INSTANCE_COUNT,
VKD3D_PATCH_COMMAND_TOKEN_COPY_FIRST_INDEX,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VERTEX_OFFSET,
VKD3D_PATCH_COMMAND_TOKEN_COPY_FIRST_INSTANCE,
};
static const enum vkd3d_patch_command_token va_types[] =
{
VKD3D_PATCH_COMMAND_TOKEN_COPY_ROOT_VA_LO,
VKD3D_PATCH_COMMAND_TOKEN_COPY_ROOT_VA_HI,
};
if (!device->device_info.device_generated_commands_features_nv.deviceGeneratedCommands)
{
WARN("Device generated commands not supported, indirect state commands will be ignored.\n");
@ -12974,6 +13015,7 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
dst_word_offset = token.offset / sizeof(uint32_t);
generic_u32_copy_count = argument_desc->Constant.Num32BitValuesToSet;
generic_u32_copy_types = NULL;
break;
case D3D12_INDIRECT_ARGUMENT_TYPE_UNORDERED_ACCESS_VIEW:
@ -13003,6 +13045,7 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
/* Simply patch by copying U32s. Need to handle unaligned U32s since everything is tightly packed. */
generic_u32_copy_count = sizeof(VkDeviceAddress) / sizeof(uint32_t);
generic_u32_copy_types = va_types;
break;
case D3D12_INDIRECT_ARGUMENT_TYPE_VERTEX_BUFFER_VIEW:
@ -13023,6 +13066,7 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
/* The VBV indirect layout is the same as DX, so just copy the U32s. */
generic_u32_copy_count = sizeof(D3D12_VERTEX_BUFFER_VIEW) / sizeof(uint32_t);
generic_u32_copy_types = vbv_types;
break;
case D3D12_INDIRECT_ARGUMENT_TYPE_INDEX_BUFFER_VIEW:
@ -13043,19 +13087,13 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
patch_commands_count + sizeof(D3D12_INDEX_BUFFER_VIEW) / sizeof(uint32_t),
sizeof(*patch_commands));
for (j = 0; j < 3; j++)
for (j = 0; j < 4; j++)
{
patch_commands[patch_commands_count].token = VKD3D_PATCH_COMMAND_TOKEN_COPY_U32;
patch_commands[patch_commands_count].token = ibv_types[j];
patch_commands[patch_commands_count].src_offset = src_word_offset++;
patch_commands[patch_commands_count].dst_offset = dst_word_offset++;
patch_commands_count++;
}
/* TODO: Make use of index LUT feature to avoid translating in CS patch shader. */
patch_commands[patch_commands_count].token = VKD3D_PATCH_COMMAND_TOKEN_COPY_INDEX_FORMAT;
patch_commands[patch_commands_count].src_offset = src_word_offset++;
patch_commands[patch_commands_count].dst_offset = dst_word_offset++;
patch_commands_count++;
break;
case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW:
@ -13066,6 +13104,7 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
stream_stride += sizeof(VkDrawIndirectCommand);
dst_word_offset = token.offset / sizeof(uint32_t);
generic_u32_copy_count = sizeof(VkDrawIndirectCommand) / sizeof(uint32_t);
generic_u32_copy_types = draw_types;
break;
case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED:
@ -13076,6 +13115,7 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
stream_stride += sizeof(VkDrawIndexedIndirectCommand);
dst_word_offset = token.offset / sizeof(uint32_t);
generic_u32_copy_count = sizeof(VkDrawIndexedIndirectCommand) / sizeof(uint32_t);
generic_u32_copy_types = draw_indexed_types;
break;
default:
@ -13096,7 +13136,8 @@ static HRESULT d3d12_command_signature_init_state_template(struct d3d12_command_
/* Simply patch by copying U32s. */
for (j = 0; j < generic_u32_copy_count; j++, patch_commands_count++)
{
patch_commands[patch_commands_count].token = VKD3D_PATCH_COMMAND_TOKEN_COPY_U32;
patch_commands[patch_commands_count].token =
generic_u32_copy_types ? generic_u32_copy_types[j] : VKD3D_PATCH_COMMAND_TOKEN_COPY_CONST_U32;
patch_commands[patch_commands_count].src_offset = src_word_offset++;
patch_commands[patch_commands_count].dst_offset = dst_word_offset++;
}

3
libs/vkd3d/shaders/cs_execute_indirect_patch.comp
View File

@ -11,8 +11,7 @@ struct Command
uint dst_offset;
};
const int COMMAND_TYPE_COPY_U32 = 0;
const int COMMAND_TYPE_COPY_INDEX_TYPE = 1;
const int COMMAND_TYPE_COPY_INDEX_TYPE = 4;
const int DXGI_FORMAT_R32_UINT = 0x2a;
const int VK_INDEX_TYPE_UINT16 = 0;
const int VK_INDEX_TYPE_UINT32 = 1;

3
libs/vkd3d/shaders/cs_execute_indirect_patch_debug_ring.comp
View File

@ -13,8 +13,7 @@ struct Command
uint dst_offset;
};
const int COMMAND_TYPE_COPY_U32 = 0;
const int COMMAND_TYPE_COPY_INDEX_TYPE = 1;
const int COMMAND_TYPE_COPY_INDEX_TYPE = 4;
const int DXGI_FORMAT_R32_UINT = 0x2a;
const int VK_INDEX_TYPE_UINT16 = 0;
const int VK_INDEX_TYPE_UINT32 = 1;

20
libs/vkd3d/vkd3d_private.h
View File

@ -2444,8 +2444,24 @@ struct vkd3d_execute_indirect_info
enum vkd3d_patch_command_token
{
VKD3D_PATCH_COMMAND_TOKEN_COPY_U32 = 0,
VKD3D_PATCH_COMMAND_TOKEN_COPY_INDEX_FORMAT = 1,
VKD3D_PATCH_COMMAND_TOKEN_COPY_CONST_U32 = 0,
VKD3D_PATCH_COMMAND_TOKEN_COPY_IBO_VA_LO = 1,
VKD3D_PATCH_COMMAND_TOKEN_COPY_IBO_VA_HI = 2,
VKD3D_PATCH_COMMAND_TOKEN_COPY_IBO_SIZE = 3,
VKD3D_PATCH_COMMAND_TOKEN_COPY_INDEX_FORMAT = 4,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VBO_VA_LO = 5,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VBO_VA_HI = 6,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VBO_SIZE = 7,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VBO_STRIDE = 8,
VKD3D_PATCH_COMMAND_TOKEN_COPY_ROOT_VA_LO = 9,
VKD3D_PATCH_COMMAND_TOKEN_COPY_ROOT_VA_HI = 10,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VERTEX_COUNT = 11,
VKD3D_PATCH_COMMAND_TOKEN_COPY_INDEX_COUNT = 12,
VKD3D_PATCH_COMMAND_TOKEN_COPY_INSTANCE_COUNT = 13,
VKD3D_PATCH_COMMAND_TOKEN_COPY_FIRST_INDEX = 14,
VKD3D_PATCH_COMMAND_TOKEN_COPY_FIRST_VERTEX = 15,
VKD3D_PATCH_COMMAND_TOKEN_COPY_FIRST_INSTANCE = 16,
VKD3D_PATCH_COMMAND_TOKEN_COPY_VERTEX_OFFSET = 17,
VKD3D_PATCH_COMMAND_INT_MAX = 0x7fffffff
};