|
2261 | 2261 | )
|
2262 | 2262 | .map_pass_err(scope)<span class="question-mark">?</span>;
|
2263 | 2263 | }
|
2264 |
| - RenderCommand::MultiDrawIndirect { |
| 2264 | + RenderCommand::DrawIndirect { |
2265 | 2265 | buffer_id,
|
2266 | 2266 | offset,
|
2267 |
| - count: <span class="prelude-val">None</span>, |
| 2267 | + count: <span class="number">1</span>, |
2268 | 2268 | indexed,
|
2269 | 2269 | } => {
|
2270 | 2270 | <span class="kw">let </span>scope = PassErrorScope::Draw {
|
|
2281 | 2281 | )
|
2282 | 2282 | .map_pass_err(scope)<span class="question-mark">?</span>;
|
2283 | 2283 | }
|
2284 |
| - RenderCommand::MultiDrawIndirect { .. } |
| 2284 | + RenderCommand::DrawIndirect { .. } |
2285 | 2285 | | RenderCommand::MultiDrawIndirectCount { .. } => <span class="macro">unimplemented!</span>(),
|
2286 | 2286 | RenderCommand::PushDebugGroup { color: <span class="kw">_</span>, len: <span class="kw">_ </span>} => <span class="macro">unimplemented!</span>(),
|
2287 | 2287 | RenderCommand::InsertDebugMarker { color: <span class="kw">_</span>, len: <span class="kw">_ </span>} => <span class="macro">unimplemented!</span>(),
|
|
2664 | 2664 |
|
2665 | 2665 | state.flush_vertices();
|
2666 | 2666 | state.flush_binds(used_bind_groups, dynamic_offsets);
|
2667 |
| - state.commands.push(ArcRenderCommand::MultiDrawIndirect { |
| 2667 | + state.commands.push(ArcRenderCommand::DrawIndirect { |
2668 | 2668 | buffer,
|
2669 | 2669 | offset,
|
2670 |
| - count: <span class="prelude-val">None</span>, |
| 2670 | + count: <span class="number">1</span>, |
2671 | 2671 | indexed,
|
2672 | 2672 | });
|
2673 | 2673 | <span class="prelude-val">Ok</span>(())
|
|
2878 | 2878 | )
|
2879 | 2879 | };
|
2880 | 2880 | }
|
2881 |
| - Cmd::MultiDrawIndirect { |
| 2881 | + Cmd::DrawIndirect { |
2882 | 2882 | buffer,
|
2883 | 2883 | offset,
|
2884 |
| - count: <span class="prelude-val">None</span>, |
| 2884 | + count: <span class="number">1</span>, |
2885 | 2885 | indexed: <span class="bool-val">false</span>,
|
2886 | 2886 | } => {
|
2887 | 2887 | <span class="kw">let </span>buffer = buffer.try_raw(snatch_guard)<span class="question-mark">?</span>;
|
2888 | 2888 | <span class="kw">unsafe </span>{ raw.draw_indirect(buffer, <span class="kw-2">*</span>offset, <span class="number">1</span>) };
|
2889 | 2889 | }
|
2890 |
| - Cmd::MultiDrawIndirect { |
| 2890 | + Cmd::DrawIndirect { |
2891 | 2891 | buffer,
|
2892 | 2892 | offset,
|
2893 |
| - count: <span class="prelude-val">None</span>, |
| 2893 | + count: <span class="number">1</span>, |
2894 | 2894 | indexed: <span class="bool-val">true</span>,
|
2895 | 2895 | } => {
|
2896 | 2896 | <span class="kw">let </span>buffer = buffer.try_raw(snatch_guard)<span class="question-mark">?</span>;
|
2897 | 2897 | <span class="kw">unsafe </span>{ raw.draw_indexed_indirect(buffer, <span class="kw-2">*</span>offset, <span class="number">1</span>) };
|
2898 | 2898 | }
|
2899 |
| - Cmd::MultiDrawIndirect { .. } | Cmd::MultiDrawIndirectCount { .. } => { |
| 2899 | + Cmd::DrawIndirect { .. } | Cmd::MultiDrawIndirectCount { .. } => { |
2900 | 2900 | <span class="kw">return </span><span class="prelude-val">Err</span>(ExecutionError::Unimplemented(<span class="string">"multi-draw-indirect"</span>))
|
2901 | 2901 | }
|
2902 | 2902 | Cmd::PushDebugGroup { .. } | Cmd::InsertDebugMarker { .. } | Cmd::PopDebugGroup => {
|
|
3504 | 3504 | buffer_id: id::BufferId,
|
3505 | 3505 | offset: BufferAddress,
|
3506 | 3506 | ) {
|
3507 |
| - bundle.base.commands.push(RenderCommand::MultiDrawIndirect { |
| 3507 | + bundle.base.commands.push(RenderCommand::DrawIndirect { |
3508 | 3508 | buffer_id,
|
3509 | 3509 | offset,
|
3510 |
| - count: <span class="prelude-val">None</span>, |
| 3510 | + count: <span class="number">1</span>, |
3511 | 3511 | indexed: <span class="bool-val">false</span>,
|
3512 | 3512 | });
|
3513 | 3513 | }
|
|
3517 | 3517 | buffer_id: id::BufferId,
|
3518 | 3518 | offset: BufferAddress,
|
3519 | 3519 | ) {
|
3520 |
| - bundle.base.commands.push(RenderCommand::MultiDrawIndirect { |
| 3520 | + bundle.base.commands.push(RenderCommand::DrawIndirect { |
3521 | 3521 | buffer_id,
|
3522 | 3522 | offset,
|
3523 |
| - count: <span class="prelude-val">None</span>, |
| 3523 | + count: <span class="number">1</span>, |
3524 | 3524 | indexed: <span class="bool-val">true</span>,
|
3525 | 3525 | });
|
3526 | 3526 | }
|
|
0 commit comments