diff options
| author | Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> | 2020-10-06 12:28:47 -0400 |
|---|---|---|
| committer | Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> | 2020-10-10 17:15:02 -0400 |
| commit | ea85e3abb9964256d6e4e19b67643dbc1906a02c (patch) | |
| tree | 6050107d87d5b101cb7bbdded52f917ef306f17d /src/panfrost | |
| parent | 3089501757ce930f90a9c00c6d08d9222f392a2c (diff) | |
pan/bi: Prefer 'texture_index' to 'image_index'
They're not images. Making the executive decision to fix the notation.
Not canonical.
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7081>
Diffstat (limited to 'src/panfrost')
| -rw-r--r-- | src/panfrost/bifrost/ISA.xml | 14 | ||||
| -rw-r--r-- | src/panfrost/bifrost/gen_pack.py | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/panfrost/bifrost/ISA.xml b/src/panfrost/bifrost/ISA.xml index ec841a0f714..20b88b6a1f3 100644 --- a/src/panfrost/bifrost/ISA.xml +++ b/src/panfrost/bifrost/ISA.xml @@ -7023,7 +7023,7 @@ <ins name="+LEA_TEX_IMM" staging="w" mask="0xff000" exact="0xd6000"> <src start="0"/> <src start="3"/> - <immediate name="image_index" start="6" size="5"/> + <immediate name="texture_index" start="6" size="5"/> <mod name="format" start="11" size="1"> <opt>u16</opt> <opt>u32</opt> @@ -7662,7 +7662,7 @@ <ins name="+TEXS_2D.f16" staging="w" mask="0xfc000" exact="0xd8000"> <src start="0"/> <src start="3"/> - <immediate name="image_index" start="6" size="3"/> + <immediate name="texture_index" start="6" size="3"/> <immediate name="sampler_index" start="10" size="3"/> <mod name="skip" start="9" size="1" opt="skip"/> <mod name="lod_mode" start="13" size="1" default="zero_lod"> @@ -7674,7 +7674,7 @@ <ins name="+TEXS_2D.f32" staging="w" mask="0xfc000" exact="0x58000"> <src start="0"/> <src start="3"/> - <immediate name="image_index" start="6" size="3"/> + <immediate name="texture_index" start="6" size="3"/> <immediate name="sampler_index" start="10" size="3"/> <mod name="skip" start="9" size="1" opt="skip"/> <mod name="lod_mode" start="13" size="1" default="zero_lod"> @@ -7688,7 +7688,7 @@ <src start="3"/> <src start="6"/> <immediate name="sampler_index" start="10" size="2"/> - <immediate name="image_index" start="12" size="2"/> + <immediate name="texture_index" start="12" size="2"/> <mod name="skip" start="9" size="1" opt="skip"/> </ins> @@ -7697,7 +7697,7 @@ <src start="3"/> <src start="6"/> <immediate name="sampler_index" start="10" size="2"/> - <immediate name="image_index" start="12" size="2"/> + <immediate name="texture_index" start="12" size="2"/> <mod name="skip" start="9" size="1" opt="skip"/> </ins> @@ -8016,7 +8016,7 @@ <ins name="+VAR_TEX.f16" staging="w" mask="0xffd00" exact="0xca100"> <immediate name="varying_index" start="0" size="3"/> - <immediate name="image_index" start="3" size="2"/> + <immediate name="texture_index" start="3" size="2"/> <mod name="update" size="1"> <opt>store</opt> <opt>retrieve</opt> @@ -8046,7 +8046,7 @@ <ins name="+VAR_TEX.f32" staging="w" mask="0xffd00" exact="0xca000"> <immediate name="varying_index" start="0" size="3"/> - <immediate name="image_index" start="3" size="2"/> + <immediate name="texture_index" start="3" size="2"/> <mod name="update" size="1"> <opt>store</opt> <opt>retrieve</opt> diff --git a/src/panfrost/bifrost/gen_pack.py b/src/panfrost/bifrost/gen_pack.py index 39cac86e715..9adaa8fcda9 100644 --- a/src/panfrost/bifrost/gen_pack.py +++ b/src/panfrost/bifrost/gen_pack.py @@ -392,7 +392,7 @@ IMMEDIATE_TABLE = { 'attribute_index': 'bi_get_immediate(ins, 0)', 'varying_index': 'bi_get_immediate(ins, 0)', 'index': 'bi_get_immediate(ins, 0)', - 'image_index': 'ins->texture.texture_index', + 'texture_index': 'ins->texture.texture_index', 'sampler_index': 'ins->texture.sampler_index', 'table': '63', # Bindless (flat addressing) mode for DTSEL_IMM |