OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Add missing XML for Bifrost samplers

Browse Source 
This is now complete and mostly 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>
This commit is contained in:
Alyssa Rosenzweig
2020-10-06 21:29:05 -04:00
parent ea85e3abb9
commit 401d594c0a
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/panfrost/pan_cmdstream.c
View File

@@ -221,8 +221,8 @@ void panfrost_sampler_desc_init_bifrost(const struct pipe_sampler_state *cso,
struct mali_bifrost_sampler_packed *hw)
{
pan_pack(hw, BIFROST_SAMPLER, cfg) {
cfg.magnify_linear = cso->mag_img_filter == PIPE_TEX_FILTER_LINEAR;
cfg.minify_linear = cso->min_img_filter == PIPE_TEX_FILTER_LINEAR;
cfg.point_sample_magnify = cso->mag_img_filter == PIPE_TEX_FILTER_LINEAR;
cfg.point_sample_minify = cso->min_img_filter == PIPE_TEX_FILTER_LINEAR;
cfg.mipmap_mode = pan_pipe_to_mipmode(cso->min_mip_filter);
cfg.normalized_coordinates = cso->normalized_coords;

17
src/panfrost/lib/midgard.xml
View File

@@ -573,15 +573,28 @@
<field name="Wrap Mode R" size="4" start="0:8" type="Wrap Mode" default="Clamp to Edge"/>
<field name="Wrap Mode T" size="4" start="0:12" type="Wrap Mode" default="Clamp to Edge"/>
<field name="Wrap Mode S" size="4" start="0:16" type="Wrap Mode" default="Clamp to Edge"/>
<field name="Round to nearest even" size="1" start="0:21" type="bool" default="false"/>
<!--- Disable sRGB-to-linear conversion (assume linear) -->
<field name="sRGB override" size="1" start="0:22" type="bool" default="false"/>
<field name="Seamless Cube Map" size="1" start="0:23" type="bool" default="true"/>
<field name="Clamp integer coordinates" size="1" start="0:24" type="bool"/>
<field name="Normalized Coordinates" size="1" start="0:25" type="bool" default="true"/>
<field name="Minify Linear" size="1" start="0:27" type="bool" default="false"/>
<field name="Magnify Linear" size="1" start="0:28" type="bool" default="false"/>
<field name="Clamp integer array indices" size="1" start="0:26" type="bool" default="true"/>
<field name="Point sample minify" size="1" start="0:27" type="bool" default="false"/>
<field name="Point sample magnify" size="1" start="0:28" type="bool" default="false"/>
<!--- Set for 0.5, clear for 0.0 -->
<field name="Magnify cutoff" size="1" start="0:29" type="bool" default="false"/>
<field name="Mipmap Mode" size="2" start="0:30" type="Mipmap Mode" default="Nearest"/>
<field name="Minimum LOD" size="13" start="1:0" type="uint" default="0"/>
<field name="Compare Function" size="3" start="1:13" type="Func" default="Never"/>
<field name="Maximum LOD" size="13" start="1:16" type="uint" default="0"/>
<field name="LOD bias" size="16" start="2:0" type="uint" default="0"/>
<field name="Maximum anisotropy" size="5" start="2:16" type="uint"/>
<field name="Anisotropy" size="1" start="2:25" type="bool"/>
<field name="Border Color R" size="32" start="4:0" type="float" default="0.0"/>
<field name="Border Color G" size="32" start="5:0" type="float" default="0.0"/>
<field name="Border Color B" size="32" start="6:0" type="float" default="0.0"/>
<field name="Border Color A" size="32" start="7:0" type="float" default="0.0"/>
</struct>
<struct name="Bifrost Texture" size="8">