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

panfrost: Remove pan_emit_fbd thunking

Browse Source 
Use a common interface.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15123>
This commit is contained in:
Alyssa Rosenzweig
2022-02-12 10:31:40 -05:00
committed by Marge Bot
parent 8dc7757754
commit 910d4f8245
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/panfrost/lib/pan_cs.c
View File

@@ -608,12 +608,12 @@ pan_force_clean_write(const struct pan_fb_info *fb, unsigned tile_size)
#endif
static unsigned
pan_emit_mfbd(const struct panfrost_device *dev,
const struct pan_fb_info *fb,
const struct pan_tls_info *tls,
const struct pan_tiler_context *tiler_ctx,
void *out)
unsigned
GENX(pan_emit_fbd)(const struct panfrost_device *dev,
const struct pan_fb_info *fb,
const struct pan_tls_info *tls,
const struct pan_tiler_context *tiler_ctx,
void *out)
{
unsigned tags = MALI_FBD_TAG_IS_MFBD;
void *fbd = out;
@@ -732,13 +732,15 @@ pan_emit_sfbd_tiler(const struct panfrost_device *dev,
pan_section_pack(fbd, FRAMEBUFFER, TILER_WEIGHTS, w);
}
static void
pan_emit_sfbd(const struct panfrost_device *dev,
const struct pan_fb_info *fb,
const struct pan_tls_info *tls,
const struct pan_tiler_context *tiler_ctx,
void *fbd)
unsigned
GENX(pan_emit_fbd)(const struct panfrost_device *dev,
const struct pan_fb_info *fb,
const struct pan_tls_info *tls,
const struct pan_tiler_context *tiler_ctx,
void *fbd)
{
assert(fb->rt_count <= 1);
GENX(pan_emit_tls)(tls,
pan_section_ptr(fbd, FRAMEBUFFER,
LOCAL_STORAGE));
@@ -836,24 +838,9 @@ pan_emit_sfbd(const struct panfrost_device *dev,
}
pan_emit_sfbd_tiler(dev, fb, tiler_ctx, fbd);
pan_section_pack(fbd, FRAMEBUFFER, PADDING_2, padding);
}
#endif
unsigned
GENX(pan_emit_fbd)(const struct panfrost_device *dev,
const struct pan_fb_info *fb,
const struct pan_tls_info *tls,
const struct pan_tiler_context *tiler_ctx,
void *out)
{
#if PAN_ARCH == 4
assert(fb->rt_count <= 1);
pan_emit_sfbd(dev, fb, tls, tiler_ctx, out);
return 0;
#else
return pan_emit_mfbd(dev, fb, tls, tiler_ctx, out);
#endif
}
#endif
#if PAN_ARCH >= 6
void