github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bump bitflags to v2 (#2358)

Browse Source
This commit is contained in:
daxpedda
2023-06-01 15:40:47 +02:00
committed by GitHub
parent 544ccf88da
commit b7f4006e46
31 changed files with 875 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@@ -28,9 +28,9 @@ dot-out = []
glsl-in = ["pp-rs"]
glsl-out = []
msl-out = []
serialize = ["serde", "indexmap/serde-1"]
deserialize = ["serde", "indexmap/serde-1"]
arbitrary = ["dep:arbitrary", "indexmap/arbitrary"]
serialize = ["serde", "bitflags/serde", "indexmap/serde-1"]
deserialize = ["serde", "bitflags/serde", "indexmap/serde-1"]
arbitrary = ["dep:arbitrary", "bitflags/arbitrary", "indexmap/arbitrary"]
spv-in = ["petgraph", "spirv"]
spv-out = ["spirv"]
wgsl-in = ["codespan-reporting", "hexf-parse", "termcolor", "unicode-xid"]
@@ -45,7 +45,7 @@ harness = false
[dependencies]
arbitrary = { version = "1.0.2", features = ["derive"], optional = true }
bitflags = "1.0.5"
bitflags = "2"
bit-set = "0.5"
termcolor = { version = "1.0.4", optional = true }
# remove termcolor dep when updating to the next version of codespan-reporting

1
src/back/glsl/features.rs
View File

@@ -7,6 +7,7 @@ use std::fmt::Write;
bitflags::bitflags! {
/// Structure used to encode additions to GLSL that aren't supported by all versions.
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct Features: u32 {
/// Buffer address space support.
const BUFFER_STORAGE = 1;

1
src/back/glsl/mod.rs
View File

@@ -216,6 +216,7 @@ bitflags::bitflags! {
/// Configuration flags for the [`Writer`].
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct WriterFlags: u32 {
/// Flip output Y and extend Z from (0, 1) to (-1, 1).
const ADJUST_COORDINATE_SPACE = 0x1;

2
src/back/mod.rs
View File

@@ -228,7 +228,7 @@ bitflags::bitflags! {
/// we might as well make one back end's life easier.)
///
/// [`RayDesc`]: crate::Module::generate_ray_desc_type
#[derive(Default)]
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
pub struct RayFlag: u32 {
const OPAQUE = 0x01;
const NO_OPAQUE = 0x02;

2
src/back/spv/mod.rs
View File

@@ -176,6 +176,7 @@ struct LocalImageType {
bitflags::bitflags! {
/// Flags corresponding to the boolean(-ish) parameters to OpTypeImage.
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
pub struct ImageTypeFlags: u8 {
const DEPTH = 0x1;
const ARRAYED = 0x2;
@@ -624,6 +625,7 @@ pub struct Writer {
}
bitflags::bitflags! {
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct WriterFlags: u32 {
/// Include debug labels for everything.
const DEBUG = 0x1;

1
src/back/wgsl/writer.rs
View File

@@ -53,6 +53,7 @@ enum Indirection {
bitflags::bitflags! {
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct WriterFlags: u32 {
/// Always annotate the type information instead of inferring.
const EXPLICIT_TYPES = 0x1;

1
src/front/glsl/ast.rs
View File

@@ -67,6 +67,7 @@ bitflags::bitflags! {
/// builtins overloads can't be generated unless explicitly used, since they might cause
/// unneeded capabilities to be requested
#[derive(Default)]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct BuiltinVariations: u32 {
/// Request the standard overloads
const STANDARD = 1 << 0;

1
src/front/spv/image.rs
View File

@@ -10,6 +10,7 @@ pub(super) struct LookupSampledImage {
bitflags::bitflags! {
/// Flags describing sampling method.
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct SamplingFlags: u32 {
/// Regular sampling.
const REGULAR = 0x1;

2
src/front/spv/mod.rs
View File

@@ -168,7 +168,7 @@ impl crate::ImageDimension {
type MemberIndex = u32;
bitflags::bitflags! {
#[derive(Default)]
#[derive(Clone, Copy, Debug, Default)]
struct DecorationFlags: u32 {
const NON_READABLE = 0x1;
const NON_WRITABLE = 0x2;

4
src/lib.rs
View File

@@ -501,7 +501,7 @@ bitflags::bitflags! {
#[cfg_attr(feature = "serialize", derive(Serialize))]
#[cfg_attr(feature = "deserialize", derive(Deserialize))]
#[cfg_attr(feature = "arbitrary", derive(Arbitrary))]
#[derive(Default)]
#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct StorageAccess: u32 {
/// Storage can be used as a source for load ops.
const LOAD = 0x1;
@@ -1195,7 +1195,7 @@ bitflags::bitflags! {
#[cfg_attr(feature = "serialize", derive(Serialize))]
#[cfg_attr(feature = "deserialize", derive(Deserialize))]
#[cfg_attr(feature = "arbitrary", derive(Arbitrary))]
#[derive(Default)]
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
pub struct Barrier: u32 {
/// Barrier affects all `AddressSpace::Storage` accesses.
const STORAGE = 0x1;

3
src/valid/analyzer.rs
View File

@@ -20,6 +20,7 @@ bitflags::bitflags! {
/// Kinds of expressions that require uniform control flow.
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct UniformityRequirements: u8 {
const WORK_GROUP_BARRIER = 0x1;
const DERIVATIVE = 0x2;
@@ -59,6 +60,7 @@ impl Uniformity {
}
bitflags::bitflags! {
#[derive(Clone, Copy, Debug, PartialEq)]
struct ExitFlags: u8 {
/// Control flow may return from the function, which makes all the
/// subsequent statements within the current function (only!)
@@ -117,6 +119,7 @@ bitflags::bitflags! {
/// Indicates how a global variable is used.
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct GlobalUse: u8 {
/// Data will be read from the variable.
const READ = 0x1;

1
src/valid/function.rs
View File

@@ -161,6 +161,7 @@ pub enum FunctionError {
bitflags::bitflags! {
#[repr(transparent)]
#[derive(Clone, Copy)]
struct ControlFlowAbility: u8 {
/// The control can return out of this block.
const RETURN = 0x1;

3
src/valid/mod.rs
View File

@@ -53,6 +53,7 @@ bitflags::bitflags! {
/// by default.)
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct ValidationFlags: u8 {
/// Expressions.
#[cfg(feature = "validate")]
@@ -86,6 +87,7 @@ bitflags::bitflags! {
#[must_use]
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct Capabilities: u16 {
/// Support for [`AddressSpace:PushConstant`].
const PUSH_CONSTANT = 0x1;
@@ -126,6 +128,7 @@ bitflags::bitflags! {
/// Validation flags.
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct ShaderStages: u8 {
const VERTEX = 0x1;
const FRAGMENT = 0x2;

1
src/valid/type.rs
View File

@@ -9,6 +9,7 @@ bitflags::bitflags! {
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[repr(transparent)]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct TypeFlags: u8 {
/// Can be used for data variables.
///

2
tests/in/bounds-check-image-restrict.param.ron
View File

@@ -8,7 +8,7 @@
),
glsl: (
version: Desktop(430),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: { },
zero_initialize_workgroup_memory: true,
),

2
tests/in/bounds-check-image-rzsw.param.ron
View File

@@ -8,7 +8,7 @@
),
glsl: (
version: Desktop(430),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: { },
zero_initialize_workgroup_memory: true,
),

2
tests/in/force_point_size_vertex_shader_webgl.param.ron
View File

@@ -4,7 +4,7 @@
version: 300,
is_webgl: true
),
writer_flags: (bits: 16),
writer_flags: ("FORCE_POINT_SIZE"),
binding_map: {},
zero_initialize_workgroup_memory: true,
),

2
tests/in/functions-webgl.param.ron
View File

@@ -4,7 +4,7 @@
version: 320,
is_webgl: false
),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: {},
zero_initialize_workgroup_memory: true,
),

2
tests/in/interpolate.param.ron
View File

@@ -8,7 +8,7 @@
),
glsl: (
version: Desktop(400),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: {},
zero_initialize_workgroup_memory: true,
),

2
tests/in/invariant.param.ron
View File

@@ -4,7 +4,7 @@
version: 300,
is_webgl: true
),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: {},
zero_initialize_workgroup_memory: true,
),

2
tests/in/multiview_webgl.param.ron
View File

@@ -5,7 +5,7 @@
version: 300,
is_webgl: true
),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: {},
zero_initialize_workgroup_memory: true,
),

2
tests/in/push-constants.param.ron
View File

@@ -5,7 +5,7 @@
version: 320,
is_webgl: false
),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: {},
zero_initialize_workgroup_memory: true,
),

2
tests/in/quad.param.ron
View File

@@ -9,7 +9,7 @@
version: 300,
is_webgl: false
),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: {},
zero_initialize_workgroup_memory: true,
),

2
tests/in/skybox.param.ron
View File

@@ -42,7 +42,7 @@
version: 320,
is_webgl: false
),
writer_flags: (bits: 0),
writer_flags: (""),
binding_map: {
(group: 0, binding: 0): 0,
(group: 0, binding: 1): 0,

1940
tests/out/analysis/access.info.ron
View File

File diff suppressed because it is too large Load Diff

212
tests/out/analysis/collatz.info.ron
View File

@@ -1,46 +1,28 @@
(
type_flags: [
(
bits: 223,
),
(
bits: 21,
),
(
bits: 21,
),
(
bits: 223,
),
("DATA | SIZED | COPY | IO_SHAREABLE | HOST_SHAREABLE | ARGUMENT | CONSTRUCTIBLE"),
("DATA | COPY | HOST_SHAREABLE"),
("DATA | COPY | HOST_SHAREABLE"),
("DATA | SIZED | COPY | IO_SHAREABLE | HOST_SHAREABLE | ARGUMENT | CONSTRUCTIBLE"),
],
functions: [
(
flags: (
bits: 63,
),
available_stages: (
bits: 7,
),
flags: ("EXPRESSIONS | BLOCKS | CONTROL_FLOW_UNIFORMITY | STRUCT_LAYOUTS | CONSTANTS | BINDINGS"),
available_stages: ("VERTEX | FRAGMENT | COMPUTE"),
uniformity: (
non_uniform_result: Some(4),
requirements: (
bits: 0,
),
requirements: (""),
),
may_kill: false,
sampling_set: [],
global_uses: [
(
bits: 0,
),
(""),
],
expressions: [
(
uniformity: (
non_uniform_result: Some(1),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -49,9 +31,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 7,
assignable_global: None,
@@ -63,9 +43,7 @@
(
uniformity: (
non_uniform_result: None,
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -77,9 +55,7 @@
(
uniformity: (
non_uniform_result: Some(4),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 4,
assignable_global: None,
@@ -91,9 +67,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -102,9 +76,7 @@
(
uniformity: (
non_uniform_result: None,
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -116,9 +88,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -130,9 +100,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -141,9 +109,7 @@
(
uniformity: (
non_uniform_result: None,
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -155,9 +121,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -166,9 +130,7 @@
(
uniformity: (
non_uniform_result: None,
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -180,9 +142,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -194,9 +154,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -205,9 +163,7 @@
(
uniformity: (
non_uniform_result: None,
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -219,9 +175,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -230,9 +184,7 @@
(
uniformity: (
non_uniform_result: None,
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -244,9 +196,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -255,9 +205,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -266,9 +214,7 @@
(
uniformity: (
non_uniform_result: None,
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -280,9 +226,7 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -291,9 +235,7 @@
(
uniformity: (
non_uniform_result: Some(4),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -302,9 +244,7 @@
(
uniformity: (
non_uniform_result: None,
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -316,9 +256,7 @@
(
uniformity: (
non_uniform_result: Some(4),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -327,9 +265,7 @@
(
uniformity: (
non_uniform_result: Some(4),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -341,32 +277,22 @@
],
entry_points: [
(
flags: (
bits: 63,
),
available_stages: (
bits: 7,
),
flags: ("EXPRESSIONS | BLOCKS | CONTROL_FLOW_UNIFORMITY | STRUCT_LAYOUTS | CONSTANTS | BINDINGS"),
available_stages: ("VERTEX | FRAGMENT | COMPUTE"),
uniformity: (
non_uniform_result: Some(4),
requirements: (
bits: 0,
),
requirements: (""),
),
may_kill: false,
sampling_set: [],
global_uses: [
(
bits: 3,
),
("READ | WRITE"),
],
expressions: [
(
uniformity: (
non_uniform_result: Some(1),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 2,
assignable_global: None,
@@ -375,45 +301,35 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: Some(1),
ty: Value(Pointer(
base: 3,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
)),
),
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: Some(1),
ty: Value(Pointer(
base: 2,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
)),
),
(
uniformity: (
non_uniform_result: Some(1),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -425,63 +341,49 @@
(
uniformity: (
non_uniform_result: Some(2),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: Some(1),
ty: Value(Pointer(
base: 1,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
)),
),
(
uniformity: (
non_uniform_result: Some(6),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: Some(1),
ty: Value(Pointer(
base: 3,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
)),
),
(
uniformity: (
non_uniform_result: Some(6),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: Some(1),
ty: Value(Pointer(
base: 2,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
)),
),
(
uniformity: (
non_uniform_result: Some(1),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -493,27 +395,21 @@
(
uniformity: (
non_uniform_result: Some(6),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: Some(1),
ty: Value(Pointer(
base: 1,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
)),
),
(
uniformity: (
non_uniform_result: Some(6),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,
@@ -522,9 +418,7 @@
(
uniformity: (
non_uniform_result: Some(4),
requirements: (
bits: 0,
),
requirements: (""),
),
ref_count: 1,
assignable_global: None,

1168
tests/out/analysis/shadow.info.ron
View File

File diff suppressed because it is too large Load Diff

12
tests/out/ir/access.ron
View File

@@ -280,9 +280,7 @@
inner: Pointer(
base: 3,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
),
),
@@ -422,9 +420,7 @@
(
name: Some("bar"),
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
binding: Some((
group: 0,
@@ -446,9 +442,7 @@
(
name: Some("qux"),
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
binding: Some((
group: 0,

4
tests/out/ir/collatz.ron
View File

@@ -47,9 +47,7 @@
(
name: Some("v_indices"),
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
binding: Some((
group: 0,

28
tests/out/ir/shadow.ron
View File

@@ -186,9 +186,7 @@
inner: Pointer(
base: 20,
space: Storage(
access: (
bits: 0,
),
access: (""),
),
),
),
@@ -197,9 +195,7 @@
inner: Pointer(
base: 19,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
),
),
@@ -208,9 +204,7 @@
inner: Pointer(
base: 18,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
),
),
@@ -219,9 +213,7 @@
inner: Pointer(
base: 17,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
),
),
@@ -244,9 +236,7 @@
inner: Pointer(
base: 4,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
),
),
@@ -255,9 +245,7 @@
inner: Pointer(
base: 1,
space: Storage(
access: (
bits: 3,
),
access: ("LOAD | STORE"),
),
),
),
@@ -631,9 +619,7 @@
(
name: Some("s_lights"),
space: Storage(
access: (
bits: 1,
),
access: ("LOAD"),
),
binding: Some((
group: 0,

1
tests/snapshots.rs
View File

@@ -11,6 +11,7 @@ const BASE_DIR_IN: &str = "tests/in";
const BASE_DIR_OUT: &str = "tests/out";
bitflags::bitflags! {
#[derive(Clone, Copy)]
struct Targets: u32 {
const IR = 0x1;
const ANALYSIS = 0x2;