microsoft/compiler: Make nir_var_to_dxil_sysvalue_type static

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20346>
This commit is contained in:
Jesse Natalie
2022-12-15 11:02:57 -08:00
committed by Marge Bot
parent f363504b42
commit 8c1af8854b
3 changed files with 29 additions and 32 deletions
+29
View File
@@ -1683,6 +1683,35 @@ dxil_sort_ps_outputs(nir_shader* s)
}
}
enum dxil_sysvalue_type {
DXIL_NO_SYSVALUE = 0,
DXIL_SYSVALUE,
DXIL_GENERATED_SYSVALUE
};
static enum dxil_sysvalue_type
nir_var_to_dxil_sysvalue_type(nir_variable *var, uint64_t other_stage_mask)
{
switch (var->data.location) {
case VARYING_SLOT_FACE:
return DXIL_GENERATED_SYSVALUE;
case VARYING_SLOT_POS:
case VARYING_SLOT_PRIMITIVE_ID:
case VARYING_SLOT_CLIP_DIST0:
case VARYING_SLOT_CLIP_DIST1:
case VARYING_SLOT_PSIZ:
case VARYING_SLOT_TESS_LEVEL_INNER:
case VARYING_SLOT_TESS_LEVEL_OUTER:
case VARYING_SLOT_VIEWPORT:
case VARYING_SLOT_LAYER:
if (!((1ull << var->data.location) & other_stage_mask))
return DXIL_SYSVALUE;
FALLTHROUGH;
default:
return DXIL_NO_SYSVALUE;
}
}
/* Order between stage values so that normal varyings come first,
* then sysvalues and then system generated values.
*/
-23
View File
@@ -6232,26 +6232,3 @@ out:
free(ctx);
return retval;
}
enum dxil_sysvalue_type
nir_var_to_dxil_sysvalue_type(nir_variable *var, uint64_t other_stage_mask)
{
switch (var->data.location) {
case VARYING_SLOT_FACE:
return DXIL_GENERATED_SYSVALUE;
case VARYING_SLOT_POS:
case VARYING_SLOT_PRIMITIVE_ID:
case VARYING_SLOT_CLIP_DIST0:
case VARYING_SLOT_CLIP_DIST1:
case VARYING_SLOT_PSIZ:
case VARYING_SLOT_TESS_LEVEL_INNER:
case VARYING_SLOT_TESS_LEVEL_OUTER:
case VARYING_SLOT_VIEWPORT:
case VARYING_SLOT_LAYER:
if (!((1ull << var->data.location) & other_stage_mask))
return DXIL_SYSVALUE;
FALLTHROUGH;
default:
return DXIL_NO_SYSVALUE;
}
}
-9
View File
@@ -35,15 +35,6 @@ extern "C" {
struct blob;
enum dxil_sysvalue_type {
DXIL_NO_SYSVALUE = 0,
DXIL_SYSVALUE,
DXIL_GENERATED_SYSVALUE
};
enum dxil_sysvalue_type
nir_var_to_dxil_sysvalue_type(nir_variable *var, uint64_t other_stage_mask);
/* Controls how resource decls/accesses are handled. Common to all:
* Images, textures, and samplers map to D3D UAV, SRV, and sampler types
* Shared is lowered to explicit I/O and then to a DXIL-specific intrinsic for 4-byte indices instead of byte addressing