diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 3 |
7 files changed, 5 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 02151d681eb..5ea97736fa8 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -73,7 +73,6 @@ brw_shader_precompile(struct gl_context *ctx, static void brw_lower_packing_builtins(struct brw_context *brw, - gl_shader_stage shader_type, exec_list *ir) { /* Gens < 7 don't have instructions to convert to or from half-precision, @@ -105,7 +104,7 @@ process_glsl_ir(struct brw_context *brw, /* lower_packing_builtins() inserts arithmetic instructions, so it * must precede lower_instructions(). */ - brw_lower_packing_builtins(brw, shader->Stage, shader->ir); + brw_lower_packing_builtins(brw, shader->ir); do_mat_op_to_vec(shader->ir); unsigned instructions_to_lower = (DIV_TO_MUL_RCP | diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 744865bd4c7..a935f42d8e2 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -191,7 +191,6 @@ remap_patch_urb_offsets(nir_block *block, nir_builder *b, void brw_nir_lower_vs_inputs(nir_shader *nir, - const struct gen_device_info *devinfo, bool is_scalar, bool use_legacy_snorm_formula, const uint8_t *vs_attrib_wa_flags) diff --git a/src/mesa/drivers/dri/i965/brw_nir.h b/src/mesa/drivers/dri/i965/brw_nir.h index 425d6ce8026..aef5c532336 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.h +++ b/src/mesa/drivers/dri/i965/brw_nir.h @@ -99,7 +99,6 @@ nir_shader *brw_preprocess_nir(const struct brw_compiler *compiler, bool brw_nir_lower_intrinsics(nir_shader *nir, struct brw_stage_prog_data *prog_data); void brw_nir_lower_vs_inputs(nir_shader *nir, - const struct gen_device_info *devinfo, bool is_scalar, bool use_legacy_snorm_formula, const uint8_t *vs_attrib_wa_flags); diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 6aa91028fb7..362f32b502a 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -2114,7 +2114,7 @@ brw_compile_vs(const struct brw_compiler *compiler, void *log_data, nir_shader *shader = nir_shader_clone(mem_ctx, src_shader); shader = brw_nir_apply_sampler_key(shader, compiler->devinfo, &key->tex, is_scalar); - brw_nir_lower_vs_inputs(shader, compiler->devinfo, is_scalar, + brw_nir_lower_vs_inputs(shader, is_scalar, use_legacy_snorm_formula, key->gl_attrib_wa_flags); brw_nir_lower_vue_outputs(shader, is_scalar); shader = brw_postprocess_nir(shader, compiler->devinfo, is_scalar); diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 1505ba6ecb1..62c6007129a 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -262,7 +262,7 @@ public: src_reg offset_value, src_reg mcs, uint32_t surface, src_reg surface_reg, - uint32_t sampler, src_reg sampler_reg); + src_reg sampler_reg); src_reg emit_mcs_fetch(const glsl_type *coordinate_type, src_reg coordinate, src_reg surface); diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp index 1d834a4be71..7b36fcaee45 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp @@ -1967,7 +1967,7 @@ vec4_visitor::nir_emit_texture(nir_tex_instr *instr) shadow_comparitor, lod, lod2, sample_index, constant_offset, offset_value, mcs, - texture, texture_reg, sampler, sampler_reg); + texture, texture_reg, sampler_reg); } void diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 3e785bc52d9..eca753c7a74 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -909,7 +909,6 @@ vec4_visitor::emit_texture(ir_texture_opcode op, src_reg mcs, uint32_t surface, src_reg surface_reg, - uint32_t sampler, src_reg sampler_reg) { /* The sampler can only meaningfully compute LOD for fragment shader @@ -1141,7 +1140,7 @@ vec4_visitor::emit_gen6_gather_wa(uint8_t wa, dst_reg dst) } void -vec4_visitor::gs_emit_vertex(int stream_id) +vec4_visitor::gs_emit_vertex(int /* stream_id */) { unreachable("not reached"); } |