fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/genxml: Fix the texture dimension field on v9+

Browse source 
The enum has more than 3 values now, and the field is 3-bit.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Tested-by: Mary Guillemard <mary.guillemard@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35731>
This commit is contained in:
Boris Brezillon 2025-06-20 17:01:00 +02:00 • committed by Marge Bot
parent 01d325ba63
commit d2d27f8d9e
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/panfrost/pan_fb_preload.c
View file

@ -83,7 +83,7 @@ enum pan_preload_resource_table {
struct pan_preload_surface {
gl_frag_result loc : 4;
nir_alu_type type : 8;
enum mali_texture_dimension dim : 2;
enum mali_texture_dimension dim : 3;
bool array : 1;
unsigned samples : 5;
};
@ -105,7 +105,7 @@ struct pan_preload_rsd_key {
enum pipe_format format;
nir_alu_type type : 8;
unsigned samples : 5;
enum mali_texture_dimension dim : 2;
enum mali_texture_dimension dim : 3;
bool array : 1;
} rts[8], z, s;
};
@ -492,6 +492,8 @@ pan_preload_get_shader(struct pan_fb_preload_cache *cache,
case MALI_TEXTURE_DIMENSION_CUBE:
sampler_dim = GLSL_SAMPLER_DIM_CUBE;
break;
default:
unreachable("Invalid dimension");
}
nir_tex_instr *tex = nir_tex_instr_create(b.shader, ms ? 3 : 1);

3
src/panfrost/genxml/v10.xml
View file

@ -427,6 +427,7 @@
<value name="1D" value="1"/>
<value name="2D" value="2"/>
<value name="3D" value="3"/>
<value name="2D Image Crop" value="4"/>
</enum>
<enum name="Wrap Mode">
@ -1297,7 +1298,7 @@
<struct name="Texture" size="8" align="32">
<field name="Type" size="4" start="0:0" type="Descriptor Type" default="Texture"/>
<field name="Dimension" size="2" start="0:4" type="Texture Dimension"/>
<field name="Dimension" size="3" start="0:4" type="Texture Dimension"/>
<field name="Sample corner position" size="1" start="0:8" type="bool" default="false"/>
<field name="Normalize coordinates" size="1" start="0:9" type="bool" default="false"/>
<field name="Format" size="22" start="0:10" type="Pixel Format"/>

3
src/panfrost/genxml/v12.xml
View file

@ -426,6 +426,7 @@
<value name="1D" value="1"/>
<value name="2D" value="2"/>
<value name="3D" value="3"/>
<value name="2D Image Crop" value="4"/>
</enum>
<enum name="Wrap Mode">
@ -1558,7 +1559,7 @@
<struct name="Texture" size="8" align="32">
<field name="Type" size="4" start="0:0" type="Descriptor Type" default="Texture"/>
<field name="Dimension" size="2" start="0:4" type="Texture Dimension"/>
<field name="Dimension" size="3" start="0:4" type="Texture Dimension"/>
<field name="Sample corner position" size="1" start="0:8" type="bool" default="false"/>
<field name="Normalize coordinates" size="1" start="0:9" type="bool" default="false"/>
<field name="Format" size="22" start="0:10" type="Pixel Format"/>

3
src/panfrost/genxml/v13.xml
View file

@ -426,6 +426,7 @@
<value name="1D" value="1"/>
<value name="2D" value="2"/>
<value name="3D" value="3"/>
<value name="2D Image Crop" value="4"/>
</enum>
<enum name="Wrap Mode">
@ -1860,7 +1861,7 @@
<struct name="Texture" size="8" align="32">
<field name="Type" size="4" start="0:0" type="Descriptor Type" default="Texture"/>
<field name="Dimension" size="2" start="0:4" type="Texture Dimension"/>
<field name="Dimension" size="3" start="0:4" type="Texture Dimension"/>
<field name="Sample corner position" size="1" start="0:8" type="bool" default="false"/>
<field name="Normalize coordinates" size="1" start="0:9" type="bool" default="false"/>
<field name="Format" size="22" start="0:10" type="Pixel Format"/>

3
src/panfrost/genxml/v9.xml
View file

@ -438,6 +438,7 @@
<value name="1D" value="1"/>
<value name="2D" value="2"/>
<value name="3D" value="3"/>
<value name="2D Image Crop" value="4"/>
</enum>
<enum name="Wrap Mode">
@ -766,7 +767,7 @@
<struct name="Texture" size="8" align="32">
<field name="Type" size="4" start="0:0" type="Descriptor Type" default="Texture"/>
<field name="Dimension" size="2" start="0:4" type="Texture Dimension"/>
<field name="Dimension" size="3" start="0:4" type="Texture Dimension"/>
<field name="Sample corner position" size="1" start="0:8" type="bool" default="false"/>
<field name="Normalize coordinates" size="1" start="0:9" type="bool" default="false"/>
<field name="Format" size="22" start="0:10" type="Pixel Format"/>