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

glsl-out: adjust coordinate space

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-06-28 01:40:45 -04:00
parent 0cf5484bba
commit cfbe83e384
7 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,6 +126,15 @@ impl fmt::Display for Version {
}
}
bitflags::bitflags! {
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
pub struct WriterFlags: u32 {
/// Extend output Z from (0,1) to (-1,1).
const ADJUST_COORDINATE_SPACE = 0x1;
}
}
/// Structure that contains the configuration used in the [`Writer`](Writer)
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
@@ -133,6 +142,8 @@ impl fmt::Display for Version {
pub struct Options {
/// The glsl version to be used
pub version: Version,
/// Configuration flags for the writer.
pub writer_flags: WriterFlags,
/// Map of resources association to binding locations.
pub binding_map: BindingMap,
}
@@ -141,6 +152,7 @@ impl Default for Options {
fn default() -> Self {
Options {
version: Version::Embedded(310),
writer_flags: WriterFlags::ADJUST_COORDINATE_SPACE,
binding_map: BindingMap::default(),
}
}
@@ -1203,7 +1215,7 @@ impl<'a, W: Write> Writer<'a, W> {
fn write_stmt(
&mut self,
sta: &crate::Statement,
ctx: &back::FunctionCtx<'_>,
ctx: &back::FunctionCtx,
indent: usize,
) -> BackendResult {
use crate::Statement;
@@ -1391,22 +1403,23 @@ impl<'a, W: Write> Writer<'a, W> {
let value = value.unwrap();
match self.module.types[result.ty].inner {
crate::TypeInner::Struct { ref members, .. } => {
let (mut is_temp_struct_used, mut return_struct) = (false, "");
if let crate::Expression::Compose { .. } =
ctx.expressions[value]
{
is_temp_struct_used = true;
return_struct = "_tmp_return";
write!(
self.out,
"{} {} = ",
&self.names[&NameKey::Type(result.ty)],
return_struct
)?;
self.write_expr(value, ctx)?;
writeln!(self.out, ";")?;
write!(self.out, "{}", INDENT.repeat(indent))?;
}
let temp_struct_name = match ctx.expressions[value] {
crate::Expression::Compose { .. } => {
let return_struct = "_tmp_return";
write!(
self.out,
"{} {} = ",
&self.names[&NameKey::Type(result.ty)],
return_struct
)?;
self.write_expr(value, ctx)?;
writeln!(self.out, ";")?;
write!(self.out, "{}", INDENT.repeat(indent))?;
Some(return_struct)
}
_ => None,
};
for (index, member) in members.iter().enumerate() {
// TODO: handle builtin in better way
if let Some(crate::Binding::BuiltIn(builtin)) =
@@ -1434,11 +1447,13 @@ impl<'a, W: Write> Writer<'a, W> {
.clone();
write!(self.out, "{} = ", varying_name)?;
if !is_temp_struct_used {
if let Some(struct_name) = temp_struct_name {
write!(self.out, "{}", struct_name)?;
} else {
self.write_expr(value, ctx)?;
}
writeln!(self.out, "{}.{};", return_struct, &field_name)?;
writeln!(self.out, ".{};", field_name)?;
write!(self.out, "{}", INDENT.repeat(indent))?;
}
}
@@ -1455,6 +1470,22 @@ impl<'a, W: Write> Writer<'a, W> {
}
}
}
if let back::FunctionType::EntryPoint(ep_index) = ctx.ty {
if self.module.entry_points[ep_index as usize].stage
== crate::ShaderStage::Vertex
&& self
.options
.writer_flags
.contains(WriterFlags::ADJUST_COORDINATE_SPACE)
{
writeln!(
self.out,
"gl_Position.z = gl_Position.z * 2.0 - gl_Position.w;",
)?;
write!(self.out, "{}", INDENT.repeat(indent))?;
}
}
writeln!(self.out, "return;")?;
}
}

5
src/front/glsl/parser.rs
View File

@@ -797,10 +797,7 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
//TODO: declaration
// type_qualifier IDENTIFIER SEMICOLON
// type_qualifier IDENTIFIER identifier_list SEMICOLON
Err(ErrorKind::NotImplemented(
token.meta,
"variable qualifier",
))
Err(ErrorKind::NotImplemented(token.meta, "variable qualifier"))
}
}
TokenValue::Semicolon => {

2
src/lib.rs
View File

@@ -942,7 +942,7 @@ pub enum Expression {
},
/// Constant value.
///
/// Every `Constant` expression
/// Every `Constant` expression
Constant(Handle<Constant>),
/// Splat scalar into a vector.
Splat {

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

@@ -5,6 +5,7 @@
spv_adjust_coordinate_space: true,
glsl: (
version: Desktop(400),
writer_flags: (bits: 0),
binding_map: {},
),
glsl_custom: true,

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

@@ -38,6 +38,7 @@
glsl_custom: true,
glsl: (
version: Embedded(320),
writer_flags: (bits: 0),
binding_map: {
(group: 0, binding: 0): 0,
(group: 0, binding: 1): 0,

1
tests/out/glsl/quad-vert.main.Vertex.glsl
View File

@@ -49,6 +49,7 @@ void main() {
type10 _tmp_return = type10(_expr10, _expr11, _expr12, _expr13, _expr14);
_vs2fs_location0 = _tmp_return.member;
gl_Position = _tmp_return.gen_gl_Position;
gl_Position.z = gl_Position.z * 2.0 - gl_Position.w;
return;
}

1
tests/out/glsl/quad.main.Vertex.glsl
View File

@@ -17,6 +17,7 @@ void main() {
VertexOutput _tmp_return = VertexOutput(uv, vec4((1.2 * pos), 0.0, 1.0));
_vs2fs_location0 = _tmp_return.uv;
gl_Position = _tmp_return.position;
gl_Position.z = gl_Position.z * 2.0 - gl_Position.w;
return;
}