panfrost: Inline flip_compare_func into pan_encoder.h

This will become the home for little GenXML-aware helpers, suitable to
be #include'd from pan_cmdstream.c (or panvk equivalent).

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11785>

diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build
index d6f6936..5bd176a 100644 (file)
--- a/src/panfrost/lib/meson.build
+++ b/src/panfrost/lib/meson.build
@@ -32,7 +32,6 @@ libpanfrost_lib_files = files(
   'pan_indirect_dispatch.c',
   'pan_indirect_draw.c',
   'pan_invocation.c',
-  'pan_sampler.c',
   'pan_samples.c',
   'pan_tiler.c',
   'pan_texture.c',

diff --git a/src/panfrost/lib/pan_encoder.h b/src/panfrost/lib/pan_encoder.h
index ecc09ca..d76682b 100644 (file)
--- a/src/panfrost/lib/pan_encoder.h
+++ b/src/panfrost/lib/pan_encoder.h
@@ -113,11 +113,20 @@ panfrost_compute_magic_divisor(unsigned hw_divisor, unsigned *o_shift, unsigned
 void panfrost_vertex_id(unsigned padded_count, struct mali_attribute_buffer_packed *attr, bool instanced);
 void panfrost_instance_id(unsigned padded_count, struct mali_attribute_buffer_packed *attr, bool instanced);
 
-/* Samplers */
-
-enum mali_func
-panfrost_flip_compare_func(enum mali_func f);
-
-
+/* Sampler comparison functions are flipped in OpenGL from the hardware, so we
+ * need to be able to flip accordingly */
+
+static inline enum mali_func
+panfrost_flip_compare_func(enum mali_func f)
+{
+        switch (f) {
+        case MALI_FUNC_LESS: return MALI_FUNC_GREATER;
+        case MALI_FUNC_GREATER: return MALI_FUNC_LESS;
+        case MALI_FUNC_LEQUAL: return MALI_FUNC_GEQUAL;
+        case MALI_FUNC_GEQUAL: return MALI_FUNC_LEQUAL;
+        default: return f;
+        }
+
+}
 
 #endif

diff --git a/src/panfrost/lib/pan_sampler.c b/src/panfrost/lib/pan_sampler.c
deleted file mode 100644 (file)
index 63ddd17..0000000
--- a/src/panfrost/lib/pan_sampler.c
+++ /dev/null
@@ -1,45 +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.
- *
- */
-
-#include "pan_encoder.h"
-
-/* Sampler comparison functions are flipped in OpenGL from the hardware, so we
- * need to be able to flip accordingly */
-
-enum mali_func
-panfrost_flip_compare_func(enum mali_func f)
-{
-        switch (f) {
-        case MALI_FUNC_LESS:
-                return MALI_FUNC_GREATER;
-        case MALI_FUNC_GREATER:
-                return MALI_FUNC_LESS;
-        case MALI_FUNC_LEQUAL:
-                return MALI_FUNC_GEQUAL;
-        case MALI_FUNC_GEQUAL:
-                return MALI_FUNC_LEQUAL;
-        default:
-                return f;
-        }
-}