Skip to content

Commit

Permalink
Merge #380
Browse files Browse the repository at this point in the history
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 <kvarkus@gmail.com>
  • Loading branch information
bors[bot] and kvark authored Nov 15, 2019
2 parents ae64e3a + b9aed69 commit f221a65
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 5 deletions.
4 changes: 4 additions & 0 deletions examples/compute/main.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#ifndef WGPU_H
#define WGPU_H
#include "wgpu.h"
Expand Down
4 changes: 4 additions & 0 deletions examples/framework.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#ifndef WGPU_H
#define WGPU_H
#include "wgpu.h"
Expand Down
8 changes: 6 additions & 2 deletions examples/framework.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#ifndef WGPU_H
#define WGPU_H
#include "wgpu.h"
Expand All @@ -6,6 +10,6 @@
WGPUU32Array read_file(const char *name);

void read_buffer_map(
WGPUBufferMapAsyncStatus status,
const uint8_t *data,
WGPUBufferMapAsyncStatus status,
const uint8_t *data,
uint8_t *userdata);
4 changes: 4 additions & 0 deletions examples/remote/main.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#define WGPU_INLINE
#define WGPU_FUNC

Expand Down
4 changes: 4 additions & 0 deletions examples/triangle/main.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#ifndef WGPU_H
#define WGPU_H
#include "wgpu.h"
Expand Down
15 changes: 13 additions & 2 deletions ffi/wgpu.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
#define WGPU_LOCAL

/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

/* Generated with cbindgen:0.9.1 */

/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
* To generate this file:
* 1. Get the latest cbindgen using `cargo install --force cbindgen`
* a. Alternatively, you can clone `https://github.com/eqrion/cbindgen` and use a tagged release
* 2. Run `rustup run nightly cbindgen toolkit/library/rust/ --lockfile Cargo.lock --crate wgpu-remote -o dom/webgpu/ffi/wgpu_ffi_generated.h`
*/

#define WGPU_LOCAL


#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
Expand Down
1 change: 1 addition & 0 deletions wgpu-native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ keywords = ["graphics"]
license = "MPL-2.0"

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

[features]
Expand Down
11 changes: 10 additions & 1 deletion wgpu-native/cbindgen.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
header = """
header = """/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */"""
autogen_warning = """/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
* To generate this file:
* 1. Get the latest cbindgen using `cargo install --force cbindgen`
* a. Alternatively, you can clone `https://github.com/eqrion/cbindgen` and use a tagged release
* 2. Run `rustup run nightly cbindgen toolkit/library/rust/ --lockfile Cargo.lock --crate wgpu-remote -o dom/webgpu/ffi/wgpu_ffi_generated.h`
*/
#define WGPU_LOCAL
"""
include_version = true
Expand Down
1 change: 1 addition & 0 deletions wgpu-remote/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ authors = [
edition = "2018"

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

[features]
Expand Down

0 comments on commit f221a65

Please sign in to comment.