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

pan/midgard: Use shared psiz clamp pass

Browse Source 
We already had a perfectly cromulent pass for this, but one landed in
common NIR code so let's switch and lighten our tree.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig
2019-08-26 12:14:11 -07:00
parent 0b225f1892
commit 20237166b6
4 changed files with 1 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/meson.build
-1
View File
@@ -29,7 +29,6 @@ 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',
src/gallium/drivers/panfrost/nir/nir_clamp_psiz.c
-75
View File
@@ -1,75 +0,0 @@
/*
* 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],
intr->num_components);
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);
}
}
src/panfrost/midgard/compiler.h
-5
View File
@@ -635,14 +635,9 @@ void emit_binary_bundle(
struct util_dynarray *emission,
int next_tag);
/* 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);
/* Optimizations */
bool midgard_opt_copy_prop(compiler_context *ctx, midgard_block *block);
src/panfrost/midgard/midgard_compile.c
+1 -1
View File
@@ -2525,7 +2525,7 @@ midgard_compile_shader_nir(struct midgard_screen *screen, nir_shader *nir, midga
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_point_size, 1.0, 1024.0);
}
NIR_PASS_V(nir, nir_lower_var_copies);