mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-09-13 09:16:14 -07:00
include: Move D3D_BLOB_PART to a new header file.
According to a clang diagnostic, redefining a typedef is C11, and we want to stick with C99.
This commit is contained in:
parent
4e1f4cc428
commit
bae6079047
Notes:
Alexandre Julliard
2023-11-06 23:17:45 +01:00
Approved-by: Henri Verbeet (@hverbeet) Approved-by: Alexandre Julliard (@julliard) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/423
@ -24,6 +24,7 @@ vkd3d_public_headers = \
|
||||
include/vkd3d_d3d9types.h \
|
||||
include/vkd3d_d3dcommon.h \
|
||||
include/vkd3d_d3dcompiler.h \
|
||||
include/vkd3d_d3dcompiler_types.h \
|
||||
include/vkd3d_d3dx9shader.h \
|
||||
include/vkd3d_dxgibase.h \
|
||||
include/vkd3d_dxgiformat.h \
|
||||
|
@ -20,6 +20,8 @@
|
||||
#define __VKD3D_D3DCOMPILER_H
|
||||
#ifndef __D3DCOMPILER_H__
|
||||
|
||||
#include <vkd3d_d3dcompiler_types.h>
|
||||
|
||||
#define D3DCOMPILE_DEBUG 0x00000001
|
||||
#define D3DCOMPILE_SKIP_VALIDATION 0x00000002
|
||||
#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004
|
||||
@ -58,27 +60,6 @@
|
||||
#define D3DCOMPILE_SECDATA_PRESERVE_TEMPLATE_SLOTS 0x00000002
|
||||
#define D3DCOMPILE_SECDATA_REQUIRE_TEMPLATE_MATCH 0x00000004
|
||||
|
||||
typedef enum D3D_BLOB_PART
|
||||
{
|
||||
D3D_BLOB_INPUT_SIGNATURE_BLOB,
|
||||
D3D_BLOB_OUTPUT_SIGNATURE_BLOB,
|
||||
D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB,
|
||||
D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB,
|
||||
D3D_BLOB_ALL_SIGNATURE_BLOB,
|
||||
D3D_BLOB_DEBUG_INFO,
|
||||
D3D_BLOB_LEGACY_SHADER,
|
||||
D3D_BLOB_XNA_PREPASS_SHADER,
|
||||
D3D_BLOB_XNA_SHADER,
|
||||
D3D_BLOB_PDB,
|
||||
D3D_BLOB_PRIVATE_DATA,
|
||||
D3D_BLOB_ROOT_SIGNATURE,
|
||||
D3D_BLOB_DEBUG_NAME,
|
||||
D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000,
|
||||
D3D_BLOB_TEST_COMPILE_DETAILS,
|
||||
D3D_BLOB_TEST_COMPILE_PERF,
|
||||
D3D_BLOB_TEST_COMPILE_REPORT
|
||||
} D3D_BLOB_PART;
|
||||
|
||||
typedef enum D3DCOMPILER_STRIP_FLAGS
|
||||
{
|
||||
D3DCOMPILER_STRIP_REFLECTION_DATA = 0x00000001,
|
||||
|
45
include/vkd3d_d3dcompiler_types.h
Normal file
45
include/vkd3d_d3dcompiler_types.h
Normal file
@ -0,0 +1,45 @@
|
||||
/*
|
||||
* Copyright 2010 Matteo Bruni for CodeWeavers
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef __VKD3D_D3DCOMPILER_TYPES_H
|
||||
#define __VKD3D_D3DCOMPILER_TYPES_H
|
||||
#ifndef __D3DCOMPILER_H__
|
||||
|
||||
typedef enum D3D_BLOB_PART
|
||||
{
|
||||
D3D_BLOB_INPUT_SIGNATURE_BLOB,
|
||||
D3D_BLOB_OUTPUT_SIGNATURE_BLOB,
|
||||
D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB,
|
||||
D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB,
|
||||
D3D_BLOB_ALL_SIGNATURE_BLOB,
|
||||
D3D_BLOB_DEBUG_INFO,
|
||||
D3D_BLOB_LEGACY_SHADER,
|
||||
D3D_BLOB_XNA_PREPASS_SHADER,
|
||||
D3D_BLOB_XNA_SHADER,
|
||||
D3D_BLOB_PDB,
|
||||
D3D_BLOB_PRIVATE_DATA,
|
||||
D3D_BLOB_ROOT_SIGNATURE,
|
||||
D3D_BLOB_DEBUG_NAME,
|
||||
D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000,
|
||||
D3D_BLOB_TEST_COMPILE_DETAILS,
|
||||
D3D_BLOB_TEST_COMPILE_PERF,
|
||||
D3D_BLOB_TEST_COMPILE_REPORT
|
||||
} D3D_BLOB_PART;
|
||||
|
||||
#endif /* __D3DCOMPILER_H__ */
|
||||
#endif /* __VKD3D_D3DCOMPILER_TYPES_H */
|
@ -20,6 +20,7 @@
|
||||
#define __VKD3D_UTILS_H
|
||||
|
||||
#include <vkd3d.h>
|
||||
#include <vkd3d_d3dcompiler_types.h>
|
||||
|
||||
#ifndef VKD3D_UTILS_API_VERSION
|
||||
#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_0
|
||||
@ -51,9 +52,6 @@ extern "C" {
|
||||
# define VKD3D_UTILS_API VKD3D_IMPORT
|
||||
#endif
|
||||
|
||||
/** \since 1.10 */
|
||||
typedef enum D3D_BLOB_PART D3D_BLOB_PART;
|
||||
|
||||
/* 1.0 */
|
||||
VKD3D_UTILS_API HANDLE vkd3d_create_event(void);
|
||||
VKD3D_UTILS_API HRESULT vkd3d_signal_event(HANDLE event);
|
||||
|
Loading…
Reference in New Issue
Block a user