From 7a36c72f5d9eda6c9e3b17a52b2a2ee94cb27039 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 11 Jul 2019 07:01:56 -0700 Subject: [PATCH] pan/decode: Depth units/factor are identical to GL I'm not sure why I thoughtt here was an off-by-one, other than maybe bad data collection. Signed-off-by: Alyssa Rosenzweig --- src/panfrost/include/panfrost-job.h | 6 +----- src/panfrost/pandecode/decode.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h index 0c559309946..0fbe0a2fa10 100644 --- a/src/panfrost/include/panfrost-job.h +++ b/src/panfrost/include/panfrost-job.h @@ -551,11 +551,7 @@ struct mali_shader_meta { } midgard1; }; - /* On bifrost: Exactly the same as glPolygonOffset() for both. - * On midgard: Depth factor is exactly as passed to glPolygonOffset. - * Depth units is equal to the value passed to glDeptOhffset + 1.0f - * (use MALI_NEGATIVE) - */ + /* Same as glPolygoOffset() arguments */ float depth_units; float depth_factor; diff --git a/src/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c index 6d7a5f03b6b..24dd8372c23 100644 --- a/src/panfrost/pandecode/decode.c +++ b/src/panfrost/pandecode/decode.c @@ -1509,12 +1509,8 @@ pandecode_replay_vertex_tiler_postfix_pre(const struct mali_vertex_tiler_postfix } if (s->depth_units || s->depth_factor) { - if (is_bifrost) - pandecode_prop("depth_units = %f", s->depth_units); - else - pandecode_prop("depth_units = MALI_NEGATIVE(%f)", s->depth_units - 1.0f); - pandecode_prop("depth_factor = %f", s->depth_factor); + pandecode_prop("depth_units = %f", s->depth_units); } if (s->alpha_coverage) { -- 2.30.2