Skip to content

Commit f221a65

Browse files
bors[bot]kvark
andauthored
Merge #380
380: More licenses for Gecko r=kvark a=kvark These are all the last things we need to match Gecko, with an exception of #379 Co-authored-by: Dzmitry Malyshau <[email protected]>
2 parents ae64e3a + b9aed69 commit f221a65

File tree

9 files changed

+47
-5
lines changed

9 files changed

+47
-5
lines changed

examples/compute/main.c

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4+
15
#ifndef WGPU_H
26
#define WGPU_H
37
#include "wgpu.h"

examples/framework.c

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4+
15
#ifndef WGPU_H
26
#define WGPU_H
37
#include "wgpu.h"

examples/framework.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4+
15
#ifndef WGPU_H
26
#define WGPU_H
37
#include "wgpu.h"
@@ -6,6 +10,6 @@
610
WGPUU32Array read_file(const char *name);
711

812
void read_buffer_map(
9-
WGPUBufferMapAsyncStatus status,
10-
const uint8_t *data,
13+
WGPUBufferMapAsyncStatus status,
14+
const uint8_t *data,
1115
uint8_t *userdata);

examples/remote/main.c

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4+
15
#define WGPU_INLINE
26
#define WGPU_FUNC
37

examples/triangle/main.c

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4+
15
#ifndef WGPU_H
26
#define WGPU_H
37
#include "wgpu.h"

ffi/wgpu.h

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
#define WGPU_LOCAL
2-
1+
/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
34

45
/* Generated with cbindgen:0.9.1 */
56

7+
/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
8+
* To generate this file:
9+
* 1. Get the latest cbindgen using `cargo install --force cbindgen`
10+
* a. Alternatively, you can clone `https://github.com/eqrion/cbindgen` and use a tagged release
11+
* 2. Run `rustup run nightly cbindgen toolkit/library/rust/ --lockfile Cargo.lock --crate wgpu-remote -o dom/webgpu/ffi/wgpu_ffi_generated.h`
12+
*/
13+
14+
#define WGPU_LOCAL
15+
16+
617
#include <stdarg.h>
718
#include <stdbool.h>
819
#include <stdint.h>

wgpu-native/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ keywords = ["graphics"]
1313
license = "MPL-2.0"
1414

1515
[lib]
16+
# Enabling these targets makes our CI bots try to build them and fail atm
1617
crate-type = ["lib", "cdylib", "staticlib"]
1718

1819
[features]

wgpu-native/cbindgen.toml

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
header = """
1+
header = """/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */"""
4+
autogen_warning = """/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
5+
* To generate this file:
6+
* 1. Get the latest cbindgen using `cargo install --force cbindgen`
7+
* a. Alternatively, you can clone `https://github.com/eqrion/cbindgen` and use a tagged release
8+
* 2. Run `rustup run nightly cbindgen toolkit/library/rust/ --lockfile Cargo.lock --crate wgpu-remote -o dom/webgpu/ffi/wgpu_ffi_generated.h`
9+
*/
10+
211
#define WGPU_LOCAL
312
"""
413
include_version = true

wgpu-remote/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ authors = [
88
edition = "2018"
99

1010
[lib]
11+
# Enabling these targets makes our CI bots try to build them and fail atm
1112
crate-type = ["lib", "cdylib", "staticlib"]
1213

1314
[features]

0 commit comments

Comments
 (0)