panfrost: Rename pan_blend.h into pan_blend_cso.h

We are about to add a pan_blend.h in src/panfrost/lib. Rename the
existing pan_blend.h so we can include both.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8963>

diff --git a/src/gallium/drivers/panfrost/Makefile.sources b/src/gallium/drivers/panfrost/Makefile.sources
index e9e4ca1..145959a 100644 (file)
--- a/src/gallium/drivers/panfrost/Makefile.sources
+++ b/src/gallium/drivers/panfrost/Makefile.sources
@@ -4,7 +4,7 @@ C_SOURCES := \
     \
        pan_assemble.c \
        pan_blend_cso.c \
-       pan_blend.h \
+       pan_blend_cso.h \
        pan_blending.c \
        pan_blending.h \
        pan_blend_shaders.c \

diff --git a/src/gallium/drivers/panfrost/pan_blend.h b/src/gallium/drivers/panfrost/pan_blend_cso.h
similarity index 98%
rename from src/gallium/drivers/panfrost/pan_blend.h
rename to src/gallium/drivers/panfrost/pan_blend_cso.h
index ba74edc..433f94a 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_blend.h
+++ b/src/gallium/drivers/panfrost/pan_blend_cso.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef __PAN_BLEND_H
-#define __PAN_BLEND_H
+#ifndef __PAN_BLEND_CSO_H
+#define __PAN_BLEND_CSO_H
 
 #include "util/hash_table.h"
 #include "nir.h"

diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.h b/src/gallium/drivers/panfrost/pan_blend_shaders.h
index 3c47f0b..7f4ce53 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_blend_shaders.h
+++ b/src/gallium/drivers/panfrost/pan_blend_shaders.h
@@ -29,7 +29,7 @@
 #include "pipe/p_defines.h"
 #include <midgard_pack.h>
 #include "pan_context.h"
-#include "pan_blend.h"
+#include "pan_blend_cso.h"
 
 struct panfrost_blend_shader *
 panfrost_create_blend_shader(struct panfrost_context *ctx,

diff --git a/src/gallium/drivers/panfrost/pan_blending.h b/src/gallium/drivers/panfrost/pan_blending.h
index e187074..ccc4025 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_blending.h
+++ b/src/gallium/drivers/panfrost/pan_blending.h
@@ -28,7 +28,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include <midgard_pack.h>
-#include "pan_blend.h"
+#include "pan_blend_cso.h"
 
 struct panfrost_blend_state;
 

diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h
index 19b081f..67750a8 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_context.h
+++ b/src/gallium/drivers/panfrost/pan_context.h
@@ -31,7 +31,7 @@
 #include <assert.h>
 #include "pan_resource.h"
 #include "pan_job.h"
-#include "pan_blend.h"
+#include "pan_blend_cso.h"
 #include "pan_encoder.h"
 #include "pan_texture.h"
 #include "midgard_pack.h"