anv/meta: Merge anv_meta_clear.h into anv_meta.h

The header was too small.

diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c
index 21c5f87eb54a85bdb2a0c056961621be1c8a7f0f..4fd61476635f13dcacdbf5820bfe21a79a0a5c17 100644 (file)
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -28,7 +28,6 @@
 #include <fcntl.h>
 
 #include "anv_meta.h"
-#include "anv_meta_clear.h"
 #include "anv_private.h"
 #include "glsl/nir/nir_builder.h"
 

diff --git a/src/vulkan/anv_meta.h b/src/vulkan/anv_meta.h
index c8d025bd825b2a810092fe688bc0742d5b1e05c1..31d344a4cbe1d3611e44eabb54836ddb7bc2fe8d 100644 (file)
--- a/src/vulkan/anv_meta.h
+++ b/src/vulkan/anv_meta.h
@@ -44,6 +44,9 @@ struct anv_meta_saved_state {
    struct anv_dynamic_state dynamic;
 };
 
+VkResult anv_device_init_meta_clear_state(struct anv_device *device);
+void anv_device_finish_meta_clear_state(struct anv_device *device);
+
 void
 anv_meta_save(struct anv_meta_saved_state *state,
               const struct anv_cmd_buffer *cmd_buffer,

diff --git a/src/vulkan/anv_meta_clear.c b/src/vulkan/anv_meta_clear.c
index da234fcbdf10c7e5df88ea3f30e0088bae2418f7..52da5b25cadc69c7737ba90c887de6899a7ba3d8 100644 (file)
--- a/src/vulkan/anv_meta_clear.c
+++ b/src/vulkan/anv_meta_clear.c
@@ -22,7 +22,6 @@
  */
 
 #include "anv_meta.h"
-#include "anv_meta_clear.h"
 #include "anv_private.h"
 #include "glsl/nir/nir_builder.h"
 

diff --git a/src/vulkan/anv_meta_clear.h b/src/vulkan/anv_meta_clear.h
deleted file mode 100644 (file)
index 853d9f2..0000000
--- a/src/vulkan/anv_meta_clear.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright © 2015 Intel Corporation
- *
- * 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.
- */
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct anv_device;
-
-VkResult anv_device_init_meta_clear_state(struct anv_device *device);
-void anv_device_finish_meta_clear_state(struct anv_device *device);
-
-#ifdef __cplusplus
-}
-#endif