From 9d7a016ed1015e52cb8b708a4a053ff2dfc88fce Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Tue, 26 Sep 2023 12:43:40 -0700 Subject: [PATCH] intel/elk: Retire the global float pixel_x/y values. Nothing used them any more. Part-of: --- src/intel/compiler/elk/elk_fs.h | 2 -- src/intel/compiler/elk/elk_fs_visitor.cpp | 15 --------------- 2 files changed, 17 deletions(-) diff --git a/src/intel/compiler/elk/elk_fs.h b/src/intel/compiler/elk/elk_fs.h index e9b8f7847f1..a5b807e18a8 100644 --- a/src/intel/compiler/elk/elk_fs.h +++ b/src/intel/compiler/elk/elk_fs.h @@ -391,8 +391,6 @@ public: elk_fs_reg uw_pixel_x; elk_fs_reg uw_pixel_y; - elk_fs_reg pixel_x; - elk_fs_reg pixel_y; elk_fs_reg pixel_z; elk_fs_reg wpos_w; elk_fs_reg pixel_w; diff --git a/src/intel/compiler/elk/elk_fs_visitor.cpp b/src/intel/compiler/elk/elk_fs_visitor.cpp index 9e3cf214dba..79bce09e1d2 100644 --- a/src/intel/compiler/elk/elk_fs_visitor.cpp +++ b/src/intel/compiler/elk/elk_fs_visitor.cpp @@ -102,8 +102,6 @@ elk_fs_visitor::emit_interpolation_setup_gfx4() this->uw_pixel_y = vgrf(glsl_uint_type()); this->uw_pixel_x.type = ELK_REGISTER_TYPE_UW; this->uw_pixel_y.type = ELK_REGISTER_TYPE_UW; - this->pixel_x = this->uw_pixel_x; - this->pixel_y = this->uw_pixel_y; abld.ADD(this->uw_pixel_x, elk_fs_reg(stride(suboffset(g1_uw, 4), 2, 4, 0)), elk_fs_reg(elk_imm_v(0x10101010))); @@ -160,9 +158,6 @@ elk_fs_visitor::emit_interpolation_setup_gfx6() const fs_builder bld = fs_builder(this).at_end(); fs_builder abld = bld.annotate("compute pixel centers"); - this->pixel_x = vgrf(glsl_float_type()); - this->pixel_y = vgrf(glsl_float_type()); - const struct elk_wm_prog_key *wm_key = (elk_wm_prog_key*) this->key; struct elk_wm_prog_data *wm_prog_data = elk_wm_prog_data(prog_data); @@ -259,9 +254,6 @@ elk_fs_visitor::emit_interpolation_setup_gfx6() horiz_stride(half_int_pixel_offset_x, 0)); hbld.emit(ELK_FS_OPCODE_PIXEL_Y, int_pixel_y, int_pixel_xy, horiz_stride(half_int_pixel_offset_y, 0)); - - hbld.MOV(offset(pixel_x, hbld, i), int_pixel_x); - hbld.MOV(offset(pixel_y, hbld, i), int_pixel_y); } else { /* The "Register Region Restrictions" page says for SNB, IVB, HSW: * @@ -277,13 +269,6 @@ elk_fs_visitor::emit_interpolation_setup_gfx6() hbld.ADD(int_pixel_y, elk_fs_reg(stride(suboffset(gi_uw, 5), 2, 4, 0)), elk_fs_reg(elk_imm_v(0x11001100))); - - /* As of gfx6, we can no longer mix float and int sources. We have - * to turn the integer pixel centers into floats for their actual - * use. - */ - hbld.MOV(offset(pixel_x, hbld, i), int_pixel_x); - hbld.MOV(offset(pixel_y, hbld, i), int_pixel_y); } }