Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

spv-out: option to skip OpName for varyings #1334

Merged
merged 1 commit into from
Sep 8, 2021
Merged

spv-out: option to skip OpName for varyings #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/back/spv/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand All @@ -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;
}
Expand Down
5 changes: 4 additions & 1 deletion src/back/spv/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
13 changes: 6 additions & 7 deletions tests/snapshots.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down