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-in] fix global storage class

Browse Source
This commit is contained in:
João Capucho
2021-05-19 20:38:40 +01:00
committed by Dzmitry Malyshau
parent a081567923
commit db1350ba4f
2 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,8 +142,8 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
fn parse_type_non_void(&mut self) -> Result<(Handle<Type>, SourceMetadata)> {
let (maybe_ty, meta) = self.parse_type()?;
let ty = maybe_ty
.ok_or_else(|| ErrorKind::SemanticError(meta, "Type can't be void".into()))?;
let ty =
maybe_ty.ok_or_else(|| ErrorKind::SemanticError(meta, "Type can't be void".into()))?;
Ok((ty, meta))
}
@@ -259,15 +259,13 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
ConstantInner::Scalar {
value: ScalarValue::Uint(int),
..
} => u32::try_from(int).map_err(|_| {
ErrorKind::SemanticError(meta, "int constant overflows".into())
}),
} => u32::try_from(int)
.map_err(|_| ErrorKind::SemanticError(meta, "int constant overflows".into())),
ConstantInner::Scalar {
value: ScalarValue::Sint(int),
..
} => u32::try_from(int).map_err(|_| {
ErrorKind::SemanticError(meta, "int constant overflows".into())
}),
} => u32::try_from(int)
.map_err(|_| ErrorKind::SemanticError(meta, "int constant overflows".into())),
_ => Err(ErrorKind::SemanticError(
meta,
"Expected a uint constant".into(),
@@ -327,11 +325,7 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
let expr = self.parse_conditional(&mut ctx, None)?;
let (root, meta) = ctx.lower(self.program, expr, false, &mut Block::new())?;
Ok((
self.program
.solve_constant(&expressions, root, meta)?,
meta,
))
Ok((self.program.solve_constant(&expressions, root, meta)?, meta))
}
fn parse_external_declaration(&mut self) -> Result<()> {
@@ -685,14 +679,14 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
ty_name: String,
meta: SourceMetadata,
) -> Result<bool> {
let mut class = StorageClass::Function;
let mut class = StorageClass::Private;
let mut binding = None;
let mut layout = None;
for qualifier in qualifiers {
match *qualifier {
TypeQualifier::StorageQualifier(StorageQualifier::StorageClass(c)) => {
if StorageClass::Function != class {
if StorageClass::Private != class {
return Err(ErrorKind::SemanticError(
meta,
"Cannot use more than one storage qualifier per declaration".into(),
@@ -1233,11 +1227,8 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
let value = {
let expr = self.parse_expression(ctx)?;
let (root, meta) = ctx.lower(self.program, expr, false, body)?;
let constant = self.program.solve_constant(
&ctx.expressions,
root,
meta,
)?;
let constant =
self.program.solve_constant(&ctx.expressions, root, meta)?;
match self.program.module.constants[constant].inner {
ConstantInner::Scalar {

14
src/front/glsl/variables.rs
View File

@@ -43,7 +43,7 @@ impl Program<'_> {
let handle = self.module.global_variables.append(GlobalVariable {
name: Some(name.into()),
class: StorageClass::Function,
class: StorageClass::Private,
binding: None,
ty,
init: None,
@@ -69,7 +69,7 @@ impl Program<'_> {
let handle = self.module.global_variables.append(GlobalVariable {
name: Some(name.into()),
class: StorageClass::Function,
class: StorageClass::Private,
binding: None,
ty,
init: None,
@@ -95,7 +95,7 @@ impl Program<'_> {
let handle = self.module.global_variables.append(GlobalVariable {
name: Some(name.into()),
class: StorageClass::Function,
class: StorageClass::Private,
binding: None,
ty,
init: None,
@@ -220,7 +220,7 @@ impl Program<'_> {
meta,
}: VarDeclaration,
) -> Result<Handle<Expression>, ErrorKind> {
let mut storage = StorageQualifier::StorageClass(StorageClass::Function);
let mut storage = StorageQualifier::StorageClass(StorageClass::Private);
let mut interpolation = None;
let mut binding = None;
let mut location = None;
@@ -230,7 +230,7 @@ impl Program<'_> {
for qualifier in qualifiers {
match *qualifier {
TypeQualifier::StorageQualifier(s) => {
if StorageQualifier::StorageClass(StorageClass::Function) != storage {
if StorageQualifier::StorageClass(StorageClass::Private) != storage {
return Err(ErrorKind::SemanticError(
meta,
"Cannot use more than one storage qualifier per declaration".into(),
@@ -317,7 +317,7 @@ impl Program<'_> {
let handle = self.module.global_variables.append(GlobalVariable {
name: Some(name.clone()),
class: StorageClass::Function,
class: StorageClass::Private,
binding: None,
ty,
init,
@@ -350,7 +350,7 @@ impl Program<'_> {
let class = match storage {
StorageQualifier::StorageClass(class) => class,
_ => StorageClass::Function,
_ => StorageClass::Private,
};
let handle = self.module.global_variables.append(GlobalVariable {