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

Merge #468

Browse Source 
468: Switch value of BufferUsage's INDIRECT and STORAGE_READ fields r=kvark a=almarklein

Closes #467. This makes the value of `INDIRECT` equal to it's value in the IDL spec. (`STORAGE_READ` is not present in the IDL spec.)

I changed the value in `resource.rs` and then ran `make ffi/wgpu.h`.


Co-authored-by: Almar Klein <almar.klein@gmail.com>
This commit is contained in:
bors[bot] 2020-01-23 16:26:53 +00:00 committed by GitHub
commit 009bde0f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffi/wgpu.h
View File

@ -502,8 +502,8 @@ typedef uint32_t WGPUBufferUsage;
#define WGPUBufferUsage_VERTEX 32 #define WGPUBufferUsage_VERTEX 32
#define WGPUBufferUsage_UNIFORM 64 #define WGPUBufferUsage_UNIFORM 64
#define WGPUBufferUsage_STORAGE 128 #define WGPUBufferUsage_STORAGE 128
#define WGPUBufferUsage_STORAGE_READ 256 #define WGPUBufferUsage_INDIRECT 256
#define WGPUBufferUsage_INDIRECT 512 #define WGPUBufferUsage_STORAGE_READ 512
#define WGPUBufferUsage_NONE 0 #define WGPUBufferUsage_NONE 0
typedef struct { typedef struct {

4
wgpu-core/src/resource.rs
View File

@ -31,8 +31,8 @@ bitflags::bitflags! {
const VERTEX = 32; const VERTEX = 32;
const UNIFORM = 64; const UNIFORM = 64;
const STORAGE = 128; const STORAGE = 128;
const STORAGE_READ = 256; const INDIRECT = 256;
const INDIRECT = 512; const STORAGE_READ = 512;
const NONE = 0; const NONE = 0;
/// The combination of all read-only usages. /// The combination of all read-only usages.
const READ_ALL = Self::MAP_READ.bits | Self::COPY_SRC.bits | const READ_ALL = Self::MAP_READ.bits | Self::COPY_SRC.bits |