Skip to content

Commit c745354

Browse files
committed
multi-draw-indirect feature no longer needed
1 parent 5b91552 commit c745354

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

tests/test_wgpu_native_basics.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,8 @@ def are_features_wgpu_legal(features):
414414
def test_features_are_legal():
415415
# A standard feature. Probably exists
416416
assert are_features_wgpu_legal(["shader-f16"])
417-
# Two common extension features
418-
assert are_features_wgpu_legal(["multi-draw-indirect", "vertex-writable-storage"])
417+
# A common extension feature
418+
assert are_features_wgpu_legal(["vertex-writable-storage"])
419419
# An uncommon extension feature. Certainly not on a mac.
420420
assert are_features_wgpu_legal(["pipeline-statistics-query"])
421421
assert are_features_wgpu_legal(
@@ -429,9 +429,7 @@ def test_features_are_legal():
429429

430430
def test_features_are_illegal():
431431
# writable is misspelled
432-
assert not are_features_wgpu_legal(
433-
["multi-draw-indirect", "vertex-writeable-storage"]
434-
)
432+
assert not are_features_wgpu_legal(["vertex-writeable-storage"])
435433
assert not are_features_wgpu_legal(["my-made-up-feature"])
436434

437435

tests/test_wgpu_vertex_instance.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
class Runner:
7272
REQUIRED_FEATURES = ["indirect-first-instance"]
73-
OPTIONAL_FEATURES = ["multi-draw-indirect", "multi-draw-indirect-count"]
73+
OPTIONAL_FEATURES = ["multi-draw-indirect-count"]
7474

7575
@classmethod
7676
def is_usable(cls):
@@ -263,9 +263,6 @@ def draw(encoder):
263263

264264

265265
def test_multi_draw_indirect(runner):
266-
if "multi-draw-indirect" not in runner.device.features:
267-
pytest.skip("Must have 'multi-draw-indirect' to run")
268-
269266
def draw(encoder):
270267
multi_draw_indirect(encoder, runner.draw_data_buffer, offset=8, count=2)
271268

@@ -329,9 +326,6 @@ def draw(encoder):
329326

330327

331328
def test_multi_draw_indexed_indirect(runner):
332-
if "multi-draw-indirect" not in runner.device.features:
333-
pytest.skip("Must have 'multi-draw-indirect' to run")
334-
335329
def draw(encoder):
336330
multi_draw_indexed_indirect(
337331
encoder, runner.draw_data_buffer_indexed, offset=8, count=2

0 commit comments

Comments
 (0)