From 9b3d66087811b7120253e26a585817eec198b521 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Mon, 25 Jan 2016 08:56:36 -0800 Subject: [PATCH] anv/meta: Merge anv_meta_clear.h into anv_meta.h The header was too small. --- src/vulkan/anv_meta.c | 1 - src/vulkan/anv_meta.h | 3 +++ src/vulkan/anv_meta_clear.c | 1 - src/vulkan/anv_meta_clear.h | 37 ------------------------------------- 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 src/vulkan/anv_meta_clear.h diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index 21c5f87eb54..4fd61476635 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -28,7 +28,6 @@ #include #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 c8d025bd825..31d344a4cbe 100644 --- 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 da234fcbdf1..52da5b25cad 100644 --- 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 index 853d9f241d8..00000000000 --- 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 -- 2.30.2