OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/llvm: lower VS IO

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6912>
This commit is contained in:
Samuel Pitoiset
2020-09-30 09:15:54 +02:00
committed by Marge Bot
parent b3402997a5
commit cdf6d93498
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -1172,11 +1172,7 @@ handle_vs_input_decl(struct radv_shader_context *ctx,
LLVMValueRef input; LLVMValueRef input;
LLVMValueRef buffer_index; LLVMValueRef buffer_index;
unsigned attrib_count = glsl_count_attribute_slots(variable->type, true); unsigned attrib_count = glsl_count_attribute_slots(variable->type, true);
uint8_t input_usage_mask =
ctx->args->shader_info->vs.input_usage_mask[variable->data.location];
unsigned num_input_channels = util_last_bit(input_usage_mask);
variable->data.driver_location = variable->data.location * 4;
enum glsl_base_type type = glsl_get_base_type(variable->type); enum glsl_base_type type = glsl_get_base_type(variable->type);
for (unsigned i = 0; i < attrib_count; ++i) { for (unsigned i = 0; i < attrib_count; ++i) {
@@ -1187,6 +1183,12 @@ handle_vs_input_decl(struct radv_shader_context *ctx,
unsigned num_format = (attrib_format >> 4) & 0x07; unsigned num_format = (attrib_format >> 4) & 0x07;
bool is_float = num_format != V_008F0C_BUF_NUM_FORMAT_UINT && bool is_float = num_format != V_008F0C_BUF_NUM_FORMAT_UINT &&
num_format != V_008F0C_BUF_NUM_FORMAT_SINT; num_format != V_008F0C_BUF_NUM_FORMAT_SINT;
uint8_t input_usage_mask =
ctx->args->shader_info->vs.input_usage_mask[variable->data.location + i];
unsigned num_input_channels = util_last_bit(input_usage_mask);
if (num_input_channels == 0)
continue;
if (ctx->args->options->key.vs.instance_rate_inputs & (1u << attrib_index)) { if (ctx->args->options->key.vs.instance_rate_inputs & (1u << attrib_index)) {
uint32_t divisor = ctx->args->options->key.vs.instance_rate_divisors[attrib_index]; uint32_t divisor = ctx->args->options->key.vs.instance_rate_divisors[attrib_index];

5
src/amd/vulkan/radv_shader.c
View File

@@ -760,11 +760,6 @@ radv_lower_io(struct radv_device *device, nir_shader *nir)
if (nir->info.stage == MESA_SHADER_COMPUTE) if (nir->info.stage == MESA_SHADER_COMPUTE)
return; return;
/* TODO: Lower IO for all stages with LLVM. */
if (nir->info.stage == MESA_SHADER_VERTEX &&
radv_use_llvm_for_stage(device, nir->info.stage))
return;
if (nir->info.stage == MESA_SHADER_FRAGMENT) { if (nir->info.stage == MESA_SHADER_FRAGMENT) {
NIR_PASS_V(nir, lower_view_index); NIR_PASS_V(nir, lower_view_index);
nir_assign_io_var_locations(nir, nir_var_shader_in, &nir->num_inputs, nir_assign_io_var_locations(nir, nir_var_shader_in, &nir->num_inputs,