nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 14:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cbindgen flags

Browse Source
This commit is contained in:
Dzmitry Malyshau 2019-08-20 14:59:17 -04:00
parent cb56ce3a0a
commit 0296e82fab
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ffi/wgpu.h
View File

@ -1,4 +1,6 @@
#define WGPU_LOCAL
struct WGPUWindow;
/* Generated with cbindgen:0.9.0 */
@ -381,7 +383,17 @@ typedef WGPUGenericId_ComputePipelineHandle WGPUComputePipelineId;
typedef WGPUId WGPUGenericId_InstanceHandle;
typedef WGPUId WGPUGenericId_SurfaceHandle;
typedef WGPUGenericId_SurfaceHandle WGPUSurfaceId;
#if !defined(WGPU_BACKEND_GL)
typedef WGPUGenericId_InstanceHandle WGPUInstanceId;
#endif
#if defined(WGPU_BACKEND_GL)
typedef WGPUSurfaceId WGPUInstanceId;
#endif
typedef WGPUId WGPUGenericId_BindGroupLayoutHandle;
@ -607,10 +619,6 @@ typedef struct {
WGPUU32Array code;
} WGPUShaderModuleDescriptor;
typedef WGPUId WGPUGenericId_SurfaceHandle;
typedef WGPUGenericId_SurfaceHandle WGPUSurfaceId;
typedef WGPUSurfaceId WGPUSwapChainId;
typedef uint32_t WGPUTextureUsage;
@ -744,7 +752,7 @@ void wgpu_compute_pass_set_bind_group(WGPUComputePassId pass_id,
void wgpu_compute_pass_set_pipeline(WGPUComputePassId pass_id, WGPUComputePipelineId pipeline_id);
#if defined(WGPU_LOCAL)
#if (defined(WGPU_LOCAL) && !defined(WGPU_BACKEND_GL))
WGPUInstanceId wgpu_create_instance(void);
#endif
@ -817,18 +825,23 @@ WGPUQueueId wgpu_device_get_queue(WGPUDeviceId device_id);
void wgpu_device_poll(WGPUDeviceId device_id, bool force_wait);
#if defined(WGPU_LOCAL)
#if (defined(WGPU_LOCAL) && !defined(WGPU_BACKEND_GL))
WGPUSurfaceId wgpu_instance_create_surface_from_macos_layer(WGPUInstanceId instance_id,
void *layer);
#endif
#if defined(WGPU_LOCAL)
#if (defined(WGPU_LOCAL) && !defined(WGPU_BACKEND_GL))
WGPUSurfaceId wgpu_instance_create_surface_from_windows_hwnd(WGPUInstanceId instance_id,
void *hinstance,
void *hwnd);
#endif
#if defined(WGPU_LOCAL)
#if (defined(WGPU_LOCAL) && defined(WGPU_WINIT) && !defined(WGPU_GLUTIN))
WGPUSurfaceId wgpu_instance_create_surface_from_winit(WGPUInstanceId instance_id,
const WGPUWindow *window);
#endif
#if (defined(WGPU_LOCAL) && !defined(WGPU_BACKEND_GL))
WGPUSurfaceId wgpu_instance_create_surface_from_xlib(WGPUInstanceId instance_id,
const void **display,
uint64_t window);

13
wgpu-native/cbindgen.toml
View File

@ -1,4 +1,7 @@
header = "#define WGPU_LOCAL"
header = """
#define WGPU_LOCAL
struct WGPUWindow;
"""
include_version = true
braces = "SameLine"
line_length = 100
@ -13,10 +16,6 @@ exclude = ["BufferMapResult"]
[parse]
parse_deps = false
[parse.expand]
crates = ["wgpu-native"]
features = ["local"]
[fn]
[struct]
@ -30,6 +29,8 @@ derive_helper_methods = true
bitflags = true
[defines]
"feature = window-winit" = "WGPU_WINDOW_WINIT"
"feature = local" = "WGPU_LOCAL"
"feature = remote" = "WGPU_REMOTE"
"feature = gfx-backend-gl" = "WGPU_BACKEND_GL"
"feature = winit" = "WGPU_WINIT"
"feature = glutin" = "WGPU_GLUTIN"

5
wgpu-remote/cbindgen.toml
View File

@ -11,10 +11,7 @@ exclude = ["BufferMapResult"]
[parse]
parse_deps = true
include = ["wgpu_native"]
[parse.expand]
crates = ["wgpu-native"]
include = ["wgpu-native"]
[fn]