KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

microsoft/compiler: Support DXIL validator 1.7 

Reviewed-by: Enrico Galli <enrico.galli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17603>
This commit is contained in:
Jesse Natalie 2022-07-17 10:50:00 -07:00 committed by Marge Bot
parent 4abe781a0b
commit 46335debf6
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/microsoft/compiler/dxil_container.c
View File

@ -90,12 +90,13 @@ typedef struct {
static uint32_t
get_semantic_name_offset(name_offset_cache_t *cache, const char *name,
struct _mesa_string_buffer *buf, uint32_t buf_offset)
struct _mesa_string_buffer *buf, uint32_t buf_offset,
bool validator_7)
{
uint32_t offset = buf->length + buf_offset;
// DXC doesn't de-duplicate arbitrary semantic names, only SVs.
if (strncmp(name, "SV_", 3) == 0) {
/* DXC doesn't de-duplicate arbitrary semantic names until validator 1.7, only SVs. */
if (validator_7 || strncmp(name, "SV_", 3) == 0) {
/* consider replacing this with a binary search using rb_tree */
for (unsigned i = 0; i < cache->num_entries; ++i) {
if (!strcmp(name, cache->entries[i].name))
@ -115,17 +116,23 @@ static uint32_t
collect_semantic_names(unsigned num_records,
struct dxil_signature_record *io_data,
struct _mesa_string_buffer *buf,
uint32_t buf_offset)
uint32_t buf_offset,
bool validator_7)
{
name_offset_cache_t cache;
cache.num_entries = 0;
for (unsigned i = 0; i < num_records; ++i) {
struct dxil_signature_record *io = &io_data[i];
uint32_t offset = get_semantic_name_offset(&cache, io->name, buf, buf_offset);
uint32_t offset = get_semantic_name_offset(&cache, io->name, buf, buf_offset, validator_7);
for (unsigned j = 0; j < io->num_elements; ++j)
io->elements[j].semantic_name_offset = offset;
}
if (validator_7 && buf->length % sizeof(uint32_t) != 0) {
unsigned padding_to_add = sizeof(uint32_t) - (buf->length % sizeof(uint32_t));
char padding[sizeof(uint32_t)] = { 0 };
_mesa_string_buffer_append_len(buf, padding, padding_to_add);
}
return buf_offset + buf->length;
}
@ -133,7 +140,8 @@ bool
dxil_container_add_io_signature(struct dxil_container *c,
enum dxil_part_fourcc part,
unsigned num_records,
struct dxil_signature_record *io_data)
struct dxil_signature_record *io_data,
bool validator_7)
{
struct {
uint32_t param_count;
@ -157,7 +165,8 @@ dxil_container_add_io_signature(struct dxil_container *c,
_mesa_string_buffer_create(NULL, 1024);
uint32_t last_offset = collect_semantic_names(num_records, io_data,
names, fixed_size);
names, fixed_size,
validator_7);
if (!add_part_header(c, part, last_offset) ||

3
src/microsoft/compiler/dxil_container.h
View File

@ -113,7 +113,8 @@ bool
dxil_container_add_io_signature(struct dxil_container *c,
enum dxil_part_fourcc part,
unsigned num_records,
struct dxil_signature_record *io);
struct dxil_signature_record *io,
bool validator_7);
bool
dxil_container_add_state_validation(struct dxil_container *c,

11
src/microsoft/compiler/nir_to_dxil.c
View File

@ -5793,7 +5793,7 @@ dxil_validator_can_validate_shader_model(unsigned sm_minor, unsigned val_minor)
}
static const unsigned dxil_validator_min_capable_version = DXIL_VALIDATOR_1_4;
static const unsigned dxil_validator_max_capable_version = DXIL_VALIDATOR_1_6;
static const unsigned dxil_validator_max_capable_version = DXIL_VALIDATOR_1_7;
bool
nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts,
@ -5935,7 +5935,8 @@ nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts,
if (!dxil_container_add_io_signature(&container,
DXIL_ISG1,
ctx->mod.num_sig_inputs,
ctx->mod.inputs)) {
ctx->mod.inputs,
ctx->mod.minor_validator >= 7)) {
debug_printf("D3D12: failed to write input signature\n");
retval = false;
goto out;
@ -5944,7 +5945,8 @@ nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts,
if (!dxil_container_add_io_signature(&container,
DXIL_OSG1,
ctx->mod.num_sig_outputs,
ctx->mod.outputs)) {
ctx->mod.outputs,
ctx->mod.minor_validator >= 7)) {
debug_printf("D3D12: failed to write output signature\n");
retval = false;
goto out;
@ -5955,7 +5957,8 @@ nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts,
!dxil_container_add_io_signature(&container,
DXIL_PSG1,
ctx->mod.num_sig_patch_consts,
ctx->mod.patch_consts)) {
ctx->mod.patch_consts,
ctx->mod.minor_validator >= 7)) {
debug_printf("D3D12: failed to write patch constant signature\n");
retval = false;
goto out;