pan/decode: Depth units/factor are identical to GL
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Thu, 11 Jul 2019 14:01:56 +0000 (07:01 -0700)
committerAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Thu, 11 Jul 2019 16:40:47 +0000 (09:40 -0700)
I'm not sure why I thoughtt here was an off-by-one, other than maybe bad
data collection.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
src/panfrost/include/panfrost-job.h
src/panfrost/pandecode/decode.c

index 0c5593099468704a44a98caaadf38c19b409df60..0fbe0a2fa10914d84e15d4ea7e07fd387e46e104 100644 (file)
@@ -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;
 
index 6d7a5f03b6b926ab348d5725910c0dc282b0e592..24dd8372c23a8d2ce38083d8bd164b65190d6009 100644 (file)
@@ -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) {