mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include: Move vkd3d_result to common header. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-11-08 17:19:29 +01:00 committed by Alexandre Julliard
parent 4d149b6f89
commit f732501a14
4 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -20,6 +20,7 @@ vkd3d_public_headers = \
include/vkd3d_dxgibase.h \
include/vkd3d_dxgiformat.h \
include/vkd3d_shader.h \
include/vkd3d_types.h \
include/vkd3d_utils.h \
include/vkd3d_windows.h

4
include/vkd3d.h
View File

@ -19,6 +19,8 @@
#ifndef __VKD3D_H
#define __VKD3D_H
#include <vkd3d_types.h>
#ifndef VKD3D_NO_WIN32_TYPES
# include "vkd3d_windows.h"
# include "vkd3d_d3d12.h"
@ -32,8 +34,6 @@
extern "C" {
#endif /* __cplusplus */
#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff
enum vkd3d_structure_type
{
VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,

16
include/vkd3d_shader.h
View File

@ -19,12 +19,12 @@
#ifndef __VKD3D_SHADER_H
#define __VKD3D_SHADER_H
#include <vkd3d_types.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff
enum vkd3d_shader_structure_type
{
VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE,
@ -34,18 +34,6 @@ enum vkd3d_shader_structure_type
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE),
};
enum vkd3d_result
{
VKD3D_OK = 0,
VKD3D_ERROR = -1, /* unspecified failure */
VKD3D_ERROR_OUT_OF_MEMORY = -2,
VKD3D_ERROR_INVALID_ARGUMENT = -3,
VKD3D_ERROR_INVALID_SHADER = -4,
VKD3D_ERROR_NOT_IMPLEMENTED = -5,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT),
};
enum vkd3d_shader_compiler_option
{
VKD3D_SHADER_STRIP_DEBUG = 0x00000001,

44
include/vkd3d_types.h Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright 2016-2018 Józef Kucia 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_TYPES_H
#define __VKD3D_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff
enum vkd3d_result
{
VKD3D_OK = 0,
VKD3D_ERROR = -1, /* unspecified failure */
VKD3D_ERROR_OUT_OF_MEMORY = -2,
VKD3D_ERROR_INVALID_ARGUMENT = -3,
VKD3D_ERROR_INVALID_SHADER = -4,
VKD3D_ERROR_NOT_IMPLEMENTED = -5,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT),
};
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __VKD3D_TYPES_H */