KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

The header was too small.
This commit is contained in:
Chad Versace 2016-01-25 08:56:36 -08:00
parent 32e4c5ae30
commit 9b3d660878
4 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/vulkan/anv_meta.c
View File

@ -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"

3
src/vulkan/anv_meta.h
View File

@ -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,

1
src/vulkan/anv_meta_clear.c
View File

@ -22,7 +22,6 @@
*/
#include "anv_meta.h"
#include "anv_meta_clear.h"
#include "anv_private.h"
#include "glsl/nir/nir_builder.h"

37
src/vulkan/anv_meta_clear.h
View File

@ -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