summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2017-05-04 14:50:20 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2017-05-09 15:08:03 -0700
commit80aa6e9d325b4784b7391cf24f1b0c291514f37b (patch)
tree1898c317d8157505bcd719e61e6bd39e95119467
parentd2fe804d1890774828a5481f5873743d71d37c2a (diff)
intel/compiler/vs: Move inputs_read handling to generic code
Reviewed-by: Alejandro PiƱeiro <apinheiro@igalia.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/intel/compiler/brw_vec4.cpp3
-rw-r--r--src/intel/vulkan/anv_pipeline.c3
-rw-r--r--src/mesa/drivers/dri/i965/brw_vs.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp
index 7b17c64275..a673dd6820 100644
--- a/src/intel/compiler/brw_vec4.cpp
+++ b/src/intel/compiler/brw_vec4.cpp
@@ -2789,6 +2789,9 @@ brw_compile_vs(const struct brw_compiler *compiler, void *log_data,
prog_data->inputs_read |= VERT_BIT_EDGEFLAG;
}
+ prog_data->inputs_read = shader->info.inputs_read;
+ prog_data->double_inputs_read = shader->info.double_inputs_read;
+
prog_data->base.clip_distance_mask =
((1 << shader->info.clip_distance_array_size) - 1);
prog_data->base.cull_distance_mask =
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 5b69d1b9e0..c43915e4c0 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -525,9 +525,6 @@ anv_pipeline_compile_vs(struct anv_pipeline *pipeline,
ralloc_steal(mem_ctx, nir);
- prog_data.inputs_read = nir->info.inputs_read;
- prog_data.double_inputs_read = nir->info.double_inputs_read;
-
brw_compute_vue_map(&pipeline->device->info,
&prog_data.base.vue_map,
nir->info.outputs_written,
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index b823a4dd5c..33f2ac19cb 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -210,8 +210,6 @@ brw_codegen_vs_prog(struct brw_context *brw,
uint64_t outputs_written =
brw_vs_outputs_written(brw, key, vp->program.info.outputs_written);
- prog_data.inputs_read = vp->program.info.inputs_read;
- prog_data.double_inputs_read = vp->program.info.double_inputs_read;
brw_compute_vue_map(devinfo,
&prog_data.base.vue_map, outputs_written,