From bb483a91663f663fac33879491dfb62b87fce3b1 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 10 Jul 2019 11:30:00 -0700 Subject: [PATCH] panfrost: Clamp point size It's not clear the hardware really has a maximum which confuses dEQP; clamp to whatever we report as our maximum. Signed-off-by: Alyssa Rosenzweig --- .../drivers/panfrost/ci/expected-failures.txt | 1 - src/gallium/drivers/panfrost/meson.build | 1 + .../drivers/panfrost/nir/nir_clamp_psiz.c | 74 +++++++++++++++++++ src/gallium/drivers/panfrost/pan_screen.c | 2 +- src/panfrost/midgard/compiler.h | 5 +- src/panfrost/midgard/midgard_compile.c | 4 +- 6 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 src/gallium/drivers/panfrost/nir/nir_clamp_psiz.c diff --git a/src/gallium/drivers/panfrost/ci/expected-failures.txt b/src/gallium/drivers/panfrost/ci/expected-failures.txt index 6f52773cc73..e76ef331a13 100644 --- a/src/gallium/drivers/panfrost/ci/expected-failures.txt +++ b/src/gallium/drivers/panfrost/ci/expected-failures.txt @@ -252,7 +252,6 @@ dEQP-GLES2.functional.polygon_offset.fixed16_enable dEQP-GLES2.functional.polygon_offset.fixed16_render_with_factor dEQP-GLES2.functional.polygon_offset.fixed16_render_with_units dEQP-GLES2.functional.polygon_offset.fixed16_result_depth_clamp -dEQP-GLES2.functional.rasterization.limits.points dEQP-GLES2.functional.shaders.builtin_variable.fragcoord_w dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_fragment dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_vertex diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index 7fdbddc0268..03dd4f5c20a 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -29,6 +29,7 @@ files_panfrost = files( 'nir/nir_undef_to_zero.c', 'nir/nir_lower_blend.c', 'nir/nir_lower_framebuffer.c', + 'nir/nir_clamp_psiz.c', 'pan_context.c', 'pan_afbc.c', diff --git a/src/gallium/drivers/panfrost/nir/nir_clamp_psiz.c b/src/gallium/drivers/panfrost/nir/nir_clamp_psiz.c new file mode 100644 index 00000000000..fb42406750b --- /dev/null +++ b/src/gallium/drivers/panfrost/nir/nir_clamp_psiz.c @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2019 Collabora, Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +/** + * @file + * + * Clamps writes to VARYING_SLOT_PSIZ to a given limit. + */ + +#include "compiler/nir/nir.h" +#include "compiler/nir/nir_builder.h" + +void +nir_clamp_psiz(nir_shader *shader, float min_size, float max_size); + +void +nir_clamp_psiz(nir_shader *shader, float min_size, float max_size) +{ + nir_foreach_function(func, shader) { + nir_foreach_block(block, func->impl) { + nir_foreach_instr_safe(instr, block) { + if (instr->type != nir_instr_type_intrinsic) + continue; + + nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); + if (intr->intrinsic != nir_intrinsic_store_deref) + continue; + + nir_variable *var = nir_intrinsic_get_var(intr, 0); + if (var->data.location != VARYING_SLOT_PSIZ) + continue; + + nir_builder b; + nir_builder_init(&b, func->impl); + b.cursor = nir_before_instr(instr); + + nir_ssa_def *in_size = nir_ssa_for_src(&b, intr->src[1], 1); + + nir_ssa_def *clamped = + nir_fmin(&b, + nir_fmax(&b, in_size, nir_imm_float(&b, min_size)), + nir_imm_float(&b, max_size)); + + nir_instr_rewrite_src(instr, &intr->src[1], + nir_src_for_ssa(clamped)); + + } + } + + nir_metadata_preserve(func->impl, nir_metadata_block_index | + nir_metadata_dominance); + } +} + diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index 9be9bad6693..f8a637be850 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -335,7 +335,7 @@ panfrost_get_paramf(struct pipe_screen *screen, enum pipe_capf param) /* fall-through */ case PIPE_CAPF_MAX_POINT_WIDTH_AA: - return 255.0; /* arbitrary */ + return 1024.0; case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: return 16.0; diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h index 79fe7dfc78a..59176f3c0ee 100644 --- a/src/panfrost/midgard/compiler.h +++ b/src/panfrost/midgard/compiler.h @@ -448,9 +448,12 @@ void emit_binary_bundle( struct util_dynarray *emission, int next_tag); -/* NIR stuff */ +/* NIR stuff. TODO: Move? Share? Something? */ bool nir_undef_to_zero(nir_shader *shader); +void +nir_clamp_psiz(nir_shader *shader, float min_size, float max_size); + #endif diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 9c1349094bd..5eb61455a75 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -2596,8 +2596,10 @@ midgard_compile_shader_nir(nir_shader *nir, midgard_program *program, bool is_bl NIR_PASS_V(nir, nir_lower_vars_to_ssa); - if (ctx->stage == MESA_SHADER_VERTEX) + if (ctx->stage == MESA_SHADER_VERTEX) { NIR_PASS_V(nir, nir_lower_viewport_transform); + NIR_PASS_V(nir, nir_clamp_psiz, 1.0, 1024.0); + } NIR_PASS_V(nir, nir_lower_var_copies); NIR_PASS_V(nir, nir_lower_vars_to_ssa); -- 2.30.2