AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Use blendable check for tib read check

Browse Source 
These are the same! Either you're blendable and can use f32/f16
conversion, or you're raw and you can only get raw. It's that simple!

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11383>
This commit is contained in:
Alyssa Rosenzweig
2021-06-11 18:02:11 -04:00
committed by Marge Bot
parent 85ab479d24
commit 2cf581b195
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt
-1
View File
@@ -81,7 +81,6 @@ dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_lowp_comp
dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_lowp_compute,Fail
dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec3_highp_fragment,Fail
dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec3_highp_fragment,Fail
dEQP-GLES31.functional.shaders.framebuffer_fetch.framebuffer_format.rgb10_a2,Fail
dEQP-GLES31.functional.shaders.opaque_type_indexing.ssbo.const_expression_vertex,Fail
dEQP-GLES31.functional.shaders.opaque_type_indexing.ssbo.const_literal_vertex,Fail
dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.const_expression_fragment,Fail
src/gallium/drivers/panfrost/pan_context.c
+2 -11
View File
@@ -367,8 +367,6 @@ panfrost_variant_matches(
struct panfrost_shader_state *variant,
enum pipe_shader_type type)
{
struct panfrost_device *dev = pan_device(ctx->base.screen);
if (variant->info.stage == MESA_SHADER_FRAGMENT &&
variant->info.fs.outputs_read) {
struct pipe_framebuffer_state *fb = &ctx->pipe_framebuffer;
@@ -380,10 +378,7 @@ panfrost_variant_matches(
if ((fb->nr_cbufs > i) && fb->cbufs[i])
fmt = fb->cbufs[i]->format;
const struct util_format_description *desc =
util_format_description(fmt);
if (pan_format_class_load(desc, dev->quirks) == PAN_FORMAT_NATIVE)
if (panfrost_blendable_formats_v6[fmt].internal)
fmt = PIPE_FORMAT_NONE;
if (variant->rt_formats[i] != fmt)
@@ -445,7 +440,6 @@ panfrost_bind_shader_state(
enum pipe_shader_type type)
{
struct panfrost_context *ctx = pan_context(pctx);
struct panfrost_device *dev = pan_device(ctx->base.screen);
ctx->shader[type] = hwcso;
ctx->dirty |= PAN_DIRTY_TLS_SIZE;
@@ -501,10 +495,7 @@ panfrost_bind_shader_state(
if ((fb->nr_cbufs > i) && fb->cbufs[i])
fmt = fb->cbufs[i]->format;
const struct util_format_description *desc =
util_format_description(fmt);
if (pan_format_class_load(desc, dev->quirks) == PAN_FORMAT_NATIVE)
if (panfrost_blendable_formats_v6[fmt].internal)
fmt = PIPE_FORMAT_NONE;
v->rt_formats[i] = fmt;
src/panfrost/util/pan_lower_framebuffer.c
+2 -2
View File
@@ -87,7 +87,7 @@ pan_unpacked_type_for_format(const struct util_format_description *desc)
}
}
enum pan_format_class
static enum pan_format_class
pan_format_class_load(const struct util_format_description *desc, unsigned quirks)
{
/* Pure integers can be loaded via EXT_framebuffer_fetch and should be
@@ -124,7 +124,7 @@ pan_format_class_load(const struct util_format_description *desc, unsigned quirk
return PAN_FORMAT_NATIVE;
}
enum pan_format_class
static enum pan_format_class
pan_format_class_store(const struct util_format_description *desc, unsigned quirks)
{
/* Check if we can do anything better than software architecturally */
src/panfrost/util/pan_lower_framebuffer.h
-2
View File
@@ -40,8 +40,6 @@ enum pan_format_class {
};
nir_alu_type pan_unpacked_type_for_format(const struct util_format_description *desc);
enum pan_format_class pan_format_class_load(const struct util_format_description *desc, unsigned quirks);
enum pan_format_class pan_format_class_store(const struct util_format_description *desc, unsigned quirks);
bool pan_lower_framebuffer(nir_shader *shader, const enum pipe_format *rt_fmts,
bool is_blend, unsigned quirks);