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

panfrost: Fix Bifrost blending with depth-only FBO

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5232>
This commit is contained in:
Alyssa Rosenzweig
2020-05-04 12:48:50 -04:00
parent a91306677c
commit 83cd3f0b4e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,7 +733,6 @@ panfrost_frag_meta_blend_update(struct panfrost_context *ctx,
if (dev->quirks & IS_BIFROST) { if (dev->quirks & IS_BIFROST) {
struct bifrost_blend_rt *brts = rts; struct bifrost_blend_rt *brts = rts;
brts[i].flags = 0x200;
if (blend[i].is_shader) { if (blend[i].is_shader) {
/* The blend shader's address needs to be at /* The blend shader's address needs to be at
* the same top 32 bit as the fragment shader. * the same top 32 bit as the fragment shader.
@@ -743,7 +742,8 @@ panfrost_frag_meta_blend_update(struct panfrost_context *ctx,
(fs->bo->gpu & (0xffffffffull << 32))); (fs->bo->gpu & (0xffffffffull << 32)));
brts[i].shader = blend[i].shader.gpu; brts[i].shader = blend[i].shader.gpu;
brts[i].unk2 = 0x0; brts[i].unk2 = 0x0;
} else { brts[i].flags = 0x200;
} else if (ctx->pipe_framebuffer.nr_cbufs > i) {
enum pipe_format format = ctx->pipe_framebuffer.cbufs[i]->format; enum pipe_format format = ctx->pipe_framebuffer.cbufs[i]->format;
const struct util_format_description *format_desc; const struct util_format_description *format_desc;
format_desc = util_format_description(format); format_desc = util_format_description(format);
@@ -757,6 +757,11 @@ panfrost_frag_meta_blend_update(struct panfrost_context *ctx,
brts[i].unk2 = 0x19; brts[i].unk2 = 0x19;
brts[i].shader_type = fs->blend_types[i]; brts[i].shader_type = fs->blend_types[i];
brts[i].flags = 0x200;
} else {
/* Dummy attachment for depth-only */
brts[i].unk2 = 0x3;
brts[i].shader_type = fs->blend_types[i];
} }
} else { } else {
struct midgard_blend_rt *mrts = rts; struct midgard_blend_rt *mrts = rts;