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

spv-out: option to skip OpName for varyings

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-09-08 09:45:02 -04:00
committed by Dzmitry Malyshau
parent c1eed779fe
commit e226cf3f1d
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -511,6 +511,9 @@ bitflags::bitflags! {
const DEBUG = 0x1;
/// Flip Y coordinate of `BuiltIn::Position` output.
const ADJUST_COORDINATE_SPACE = 0x2;
/// Emit `OpLabel` for input/output locations.
/// Some drivers treat it as semantic, not allowing any conflicts.
const LABEL_VARYINGS = 0x4;
}
}
@@ -535,7 +538,7 @@ pub struct Options {
impl Default for Options {
fn default() -> Self {
let mut flags = WriterFlags::ADJUST_COORDINATE_SPACE;
let mut flags = WriterFlags::ADJUST_COORDINATE_SPACE | WriterFlags::LABEL_VARYINGS;
if cfg!(debug_assertions) {
flags |= WriterFlags::DEBUG;
}

5
src/back/spv/writer.rs
View File

@@ -1038,7 +1038,10 @@ impl Writer {
Instruction::variable(pointer_type_id, id, class, None)
.to_words(&mut self.logical_layout.declarations);
if self.flags.contains(WriterFlags::DEBUG) {
if self
.flags
.contains(WriterFlags::DEBUG | WriterFlags::LABEL_VARYINGS)
{
if let Some(name) = debug_name {
self.debugs.push(Instruction::name(id, name));
}

13
tests/snapshots.rs
View File

@@ -176,13 +176,12 @@ fn write_output_spv(
use naga::back::spv;
use rspirv::binary::Disassemble;
let mut flags = spv::WriterFlags::empty();
if params.spv_debug {
flags |= spv::WriterFlags::DEBUG;
}
if params.spv_adjust_coordinate_space {
flags |= spv::WriterFlags::ADJUST_COORDINATE_SPACE;
}
let mut flags = spv::WriterFlags::LABEL_VARYINGS;
flags.set(spv::WriterFlags::DEBUG, params.spv_debug);
flags.set(
spv::WriterFlags::ADJUST_COORDINATE_SPACE,
params.spv_adjust_coordinate_space,
);
let options = spv::Options {
lang_version: params.spv_version,
flags,