Skip to content

Commit 4ac98ea

Browse files
teoxoyteoxoy
committed
rename const_expressions to global_expressions 
1 parent 6452a5b commit 4ac98ea

34 files changed

+172
-170
lines changed

‎naga/src/back/glsl/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2395,7 +2395,7 @@ impl<'a, W: Write> Writer<'a, W> {
23952395
fn write_const_expr(&mut self, expr: Handle<crate::Expression>) -> BackendResult {
23962396
self.write_possibly_const_expr(
23972397
expr,
2398-
&self.module.const_expressions,
2398+
&self.module.global_expressions,
23992399
|expr| &self.info[expr],
24002400
|writer, expr| writer.write_const_expr(expr),
24012401
)

‎naga/src/back/hlsl/writer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
258258

259259
self.write_special_functions(module)?;
260260

261-
self.write_wrapped_compose_functions(module, &module.const_expressions)?;
261+
self.write_wrapped_compose_functions(module, &module.global_expressions)?;
262262

263263
// Write all named constants
264264
let mut constants = module
@@ -2022,7 +2022,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
20222022
self.write_possibly_const_expression(
20232023
module,
20242024
expr,
2025-
&module.const_expressions,
2025+
&module.global_expressions,
20262026
|writer, expr| writer.write_const_expression(module, expr),
20272027
)
20282028
}

‎naga/src/back/msl/writer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ impl<W: Write> Writer<W> {
12271227
) -> BackendResult {
12281228
self.put_possibly_const_expression(
12291229
expr_handle,
1230-
&module.const_expressions,
1230+
&module.global_expressions,
12311231
module,
12321232
mod_info,
12331233
&(module, mod_info),

‎naga/src/back/pipeline_constants.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ pub(super) fn process_overrides<'a>(
3333

3434
let mut module = module.clone();
3535
let mut override_map = Vec::with_capacity(module.overrides.len());
36-
let mut adjusted_const_expressions = Vec::with_capacity(module.const_expressions.len());
36+
let mut adjusted_global_expressions = Vec::with_capacity(module.global_expressions.len());
3737
let mut adjusted_constant_initializers = HashSet::with_capacity(module.constants.len());
3838

3939
let mut global_expression_kind_tracker = crate::proc::ExpressionKindTracker::new();
4040

4141
let mut override_iter = module.overrides.drain();
4242

43-
for (old_h, expr, span) in module.const_expressions.drain() {
43+
for (old_h, expr, span) in module.global_expressions.drain() {
4444
let mut expr = match expr {
4545
Expression::Override(h) => {
4646
let c_h = if let Some(new_h) = override_map.get(h.index()) {
@@ -54,7 +54,7 @@ pub(super) fn process_overrides<'a>(
5454
pipeline_constants,
5555
&mut module,
5656
&mut override_map,
57-
&adjusted_const_expressions,
57+
&adjusted_global_expressions,
5858
&mut adjusted_constant_initializers,
5959
&mut global_expression_kind_tracker,
6060
)?);
@@ -68,7 +68,7 @@ pub(super) fn process_overrides<'a>(
6868
}
6969
Expression::Constant(c_h) => {
7070
adjusted_constant_initializers.insert(c_h);
71-
module.constants[c_h].init = adjusted_const_expressions[c_h.index()];
71+
module.constants[c_h].init = adjusted_global_expressions[c_h.index()];
7272
expr
7373
}
7474
expr => expr,
@@ -78,10 +78,10 @@ pub(super) fn process_overrides<'a>(
7878
&mut global_expression_kind_tracker,
7979
false,
8080
);
81-
adjust_expr(&adjusted_const_expressions, &mut expr);
81+
adjust_expr(&adjusted_global_expressions, &mut expr);
8282
let h = evaluator.try_eval_and_append(expr, span)?;
83-
debug_assert_eq!(old_h.index(), adjusted_const_expressions.len());
84-
adjusted_const_expressions.push(h);
83+
debug_assert_eq!(old_h.index(), adjusted_global_expressions.len());
84+
adjusted_global_expressions.push(h);
8585
}
8686

8787
for entry in override_iter {
@@ -90,7 +90,7 @@ pub(super) fn process_overrides<'a>(
9090
pipeline_constants,
9191
&mut module,
9292
&mut override_map,
93-
&adjusted_const_expressions,
93+
&adjusted_global_expressions,
9494
&mut adjusted_constant_initializers,
9595
&mut global_expression_kind_tracker,
9696
)?;
@@ -101,12 +101,12 @@ pub(super) fn process_overrides<'a>(
101101
.iter_mut()
102102
.filter(|&(c_h, _)| !adjusted_constant_initializers.contains(&c_h))
103103
{
104-
c.init = adjusted_const_expressions[c.init.index()];
104+
c.init = adjusted_global_expressions[c.init.index()];
105105
}
106106

107107
for (_, v) in module.global_variables.iter_mut() {
108108
if let Some(ref mut init) = v.init {
109-
*init = adjusted_const_expressions[init.index()];
109+
*init = adjusted_global_expressions[init.index()];
110110
}
111111
}
112112

@@ -120,7 +120,7 @@ fn process_override(
120120
pipeline_constants: &PipelineConstants,
121121
module: &mut Module,
122122
override_map: &mut Vec<Handle<Constant>>,
123-
adjusted_const_expressions: &[Handle<Expression>],
123+
adjusted_global_expressions: &[Handle<Expression>],
124124
adjusted_constant_initializers: &mut HashSet<Handle<Constant>>,
125125
global_expression_kind_tracker: &mut crate::proc::ExpressionKindTracker,
126126
) -> Result<Handle<Constant>, PipelineConstantError> {
@@ -137,12 +137,12 @@ fn process_override(
137137
_ => unreachable!(),
138138
};
139139
let expr = module
140-
.const_expressions
140+
.global_expressions
141141
.append(Expression::Literal(literal), Span::UNDEFINED);
142142
global_expression_kind_tracker.insert(expr, crate::proc::ExpressionKind::Const);
143143
expr
144144
} else if let Some(init) = override_.init {
145-
adjusted_const_expressions[init.index()]
145+
adjusted_global_expressions[init.index()]
146146
} else {
147147
return Err(PipelineConstantError::MissingValue(key.to_string()));
148148
};

‎naga/src/back/spv/writer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ impl Writer {
12531253
ir_module: &crate::Module,
12541254
mod_info: &ModuleInfo,
12551255
) -> Result<Word, Error> {
1256-
let id = match ir_module.const_expressions[handle] {
1256+
let id = match ir_module.global_expressions[handle] {
12571257
crate::Expression::Literal(literal) => self.get_constant_scalar(literal),
12581258
crate::Expression::Constant(constant) => {
12591259
let constant = &ir_module.constants[constant];
@@ -1267,7 +1267,7 @@ impl Writer {
12671267
let component_ids: Vec<_> = crate::proc::flatten_compose(
12681268
ty,
12691269
components,
1270-
&ir_module.const_expressions,
1270+
&ir_module.global_expressions,
12711271
&ir_module.types,
12721272
)
12731273
.map(|component| self.constant_ids[component.index()])
@@ -1903,8 +1903,8 @@ impl Writer {
19031903

19041904
// write all const-expressions as constants
19051905
self.constant_ids
1906-
.resize(ir_module.const_expressions.len(), 0);
1907-
for (handle, _) in ir_module.const_expressions.iter() {
1906+
.resize(ir_module.global_expressions.len(), 0);
1907+
for (handle, _) in ir_module.global_expressions.iter() {
19081908
self.write_constant_expr(handle, ir_module, mod_info)?;
19091909
}
19101910
debug_assert!(self.constant_ids.iter().all(|&id| id != 0));

‎naga/src/back/wgsl/writer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ impl<W: Write> Writer<W> {
10751075
self.write_possibly_const_expression(
10761076
module,
10771077
expr,
1078-
&module.const_expressions,
1078+
&module.global_expressions,
10791079
|writer, expr| writer.write_const_expression(module, expr),
10801080
)
10811081
}

‎naga/src/compact/expressions.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ pub struct ExpressionTracer<'tracer> {
2121
/// the module's constant expression arena.
2222
pub expressions_used: &'tracer mut HandleSet<crate::Expression>,
2323

24-
/// The used set for the module's `const_expressions` arena.
24+
/// The used set for the module's `global_expressions` arena.
2525
///
2626
/// If `None`, we are already tracing the constant expressions,
2727
/// and `expressions_used` already refers to their handle set.
28-
pub const_expressions_used: Option<&'tracer mut HandleSet<crate::Expression>>,
28+
pub global_expressions_used: Option<&'tracer mut HandleSet<crate::Expression>>,
2929
}
3030

3131
impl<'tracer> ExpressionTracer<'tracer> {
@@ -40,11 +40,11 @@ impl<'tracer> ExpressionTracer<'tracer> {
4040
/// marked.
4141
///
4242
/// [fe]: crate::Function::expressions
43-
/// [ce]: crate::Module::const_expressions
43+
/// [ce]: crate::Module::global_expressions
4444
pub fn trace_expressions(&mut self) {
4545
log::trace!(
4646
"entering trace_expression of {}",
47-
if self.const_expressions_used.is_some() {
47+
if self.global_expressions_used.is_some() {
4848
"function expressions"
4949
} else {
5050
"const expressions"
@@ -84,7 +84,7 @@ impl<'tracer> ExpressionTracer<'tracer> {
8484
// and the constant refers to the initializer, it must
8585
// precede `expr` in the arena.
8686
let init = self.constants[handle].init;
87-
match self.const_expressions_used {
87+
match self.global_expressions_used {
8888
Some(ref mut used) => used.insert(init),
8989
None => self.expressions_used.insert(init),
9090
}
@@ -122,7 +122,7 @@ impl<'tracer> ExpressionTracer<'tracer> {
122122
self.expressions_used
123123
.insert_iter([image, sampler, coordinate]);
124124
self.expressions_used.insert_iter(array_index);
125-
match self.const_expressions_used {
125+
match self.global_expressions_used {
126126
Some(ref mut used) => used.insert_iter(offset),
127127
None => self.expressions_used.insert_iter(offset),
128128
}
@@ -276,7 +276,7 @@ impl ModuleMap {
276276
adjust(coordinate);
277277
operand_map.adjust_option(array_index);
278278
if let Some(ref mut offset) = *offset {
279-
self.const_expressions.adjust(offset);
279+
self.global_expressions.adjust(offset);
280280
}
281281
self.adjust_sample_level(level, operand_map);
282282
operand_map.adjust_option(depth_ref);

‎naga/src/compact/functions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub struct FunctionTracer<'a> {
88

99
pub types_used: &'a mut HandleSet<crate::Type>,
1010
pub constants_used: &'a mut HandleSet<crate::Constant>,
11-
pub const_expressions_used: &'a mut HandleSet<crate::Expression>,
11+
pub global_expressions_used: &'a mut HandleSet<crate::Expression>,
1212

1313
/// Function-local expressions used.
1414
pub expressions_used: HandleSet<crate::Expression>,
@@ -54,7 +54,7 @@ impl<'a> FunctionTracer<'a> {
5454
types_used: self.types_used,
5555
constants_used: self.constants_used,
5656
expressions_used: &mut self.expressions_used,
57-
const_expressions_used: Some(&mut self.const_expressions_used),
57+
global_expressions_used: Some(&mut self.global_expressions_used),
5858
}
5959
}
6060
}

‎naga/src/compact/mod.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub fn compact(module: &mut crate::Module) {
3838
log::trace!("tracing global {:?}", global.name);
3939
module_tracer.types_used.insert(global.ty);
4040
if let Some(init) = global.init {
41-
module_tracer.const_expressions_used.insert(init);
41+
module_tracer.global_expressions_used.insert(init);
4242
}
4343
}
4444
}
@@ -50,15 +50,15 @@ pub fn compact(module: &mut crate::Module) {
5050
for (handle, constant) in module.constants.iter() {
5151
if constant.name.is_some() {
5252
module_tracer.constants_used.insert(handle);
53-
module_tracer.const_expressions_used.insert(constant.init);
53+
module_tracer.global_expressions_used.insert(constant.init);
5454
}
5555
}
5656

5757
// We treat all overrides as used by definition.
5858
for (_, override_) in module.overrides.iter() {
5959
module_tracer.types_used.insert(override_.ty);
6060
if let Some(init) = override_.init {
61-
module_tracer.const_expressions_used.insert(init);
61+
module_tracer.global_expressions_used.insert(init);
6262
}
6363
}
6464

@@ -145,9 +145,9 @@ pub fn compact(module: &mut crate::Module) {
145145

146146
// Drop unused constant expressions, reusing existing storage.
147147
log::trace!("adjusting constant expressions");
148-
module.const_expressions.retain_mut(|handle, expr| {
149-
if module_map.const_expressions.used(handle) {
150-
module_map.adjust_expression(expr, &module_map.const_expressions);
148+
module.global_expressions.retain_mut(|handle, expr| {
149+
if module_map.global_expressions.used(handle) {
150+
module_map.adjust_expression(expr, &module_map.global_expressions);
151151
true
152152
} else {
153153
false
@@ -159,7 +159,7 @@ pub fn compact(module: &mut crate::Module) {
159159
module.constants.retain_mut(|handle, constant| {
160160
if module_map.constants.used(handle) {
161161
module_map.types.adjust(&mut constant.ty);
162-
module_map.const_expressions.adjust(&mut constant.init);
162+
module_map.global_expressions.adjust(&mut constant.init);
163163
true
164164
} else {
165165
false
@@ -171,7 +171,7 @@ pub fn compact(module: &mut crate::Module) {
171171
for (_, override_) in module.overrides.iter_mut() {
172172
module_map.types.adjust(&mut override_.ty);
173173
if let Some(init) = override_.init.as_mut() {
174-
module_map.const_expressions.adjust(init);
174+
module_map.global_expressions.adjust(init);
175175
}
176176
}
177177

@@ -181,7 +181,7 @@ pub fn compact(module: &mut crate::Module) {
181181
log::trace!("adjusting global {:?}", global.name);
182182
module_map.types.adjust(&mut global.ty);
183183
if let Some(ref mut init) = global.init {
184-
module_map.const_expressions.adjust(init);
184+
module_map.global_expressions.adjust(init);
185185
}
186186
}
187187

@@ -210,7 +210,7 @@ struct ModuleTracer<'module> {
210210
module: &'module crate::Module,
211211
types_used: HandleSet<crate::Type>,
212212
constants_used: HandleSet<crate::Constant>,
213-
const_expressions_used: HandleSet<crate::Expression>,
213+
global_expressions_used: HandleSet<crate::Expression>,
214214
}
215215

216216
impl<'module> ModuleTracer<'module> {
@@ -219,7 +219,7 @@ impl<'module> ModuleTracer<'module> {
219219
module,
220220
types_used: HandleSet::for_arena(&module.types),
221221
constants_used: HandleSet::for_arena(&module.constants),
222-
const_expressions_used: HandleSet::for_arena(&module.const_expressions),
222+
global_expressions_used: HandleSet::for_arena(&module.global_expressions),
223223
}
224224
}
225225

@@ -250,13 +250,13 @@ impl<'module> ModuleTracer<'module> {
250250

251251
fn as_const_expression(&mut self) -> expressions::ExpressionTracer {
252252
expressions::ExpressionTracer {
253-
expressions: &self.module.const_expressions,
253+
expressions: &self.module.global_expressions,
254254
constants: &self.module.constants,
255255
overrides: &self.module.overrides,
256256
types_used: &mut self.types_used,
257257
constants_used: &mut self.constants_used,
258-
expressions_used: &mut self.const_expressions_used,
259-
const_expressions_used: None,
258+
expressions_used: &mut self.global_expressions_used,
259+
global_expressions_used: None,
260260
}
261261
}
262262

@@ -270,7 +270,7 @@ impl<'module> ModuleTracer<'module> {
270270
overrides: &self.module.overrides,
271271
types_used: &mut self.types_used,
272272
constants_used: &mut self.constants_used,
273-
const_expressions_used: &mut self.const_expressions_used,
273+
global_expressions_used: &mut self.global_expressions_used,
274274
expressions_used: HandleSet::for_arena(&function.expressions),
275275
}
276276
}
@@ -279,15 +279,15 @@ impl<'module> ModuleTracer<'module> {
279279
struct ModuleMap {
280280
types: HandleMap<crate::Type>,
281281
constants: HandleMap<crate::Constant>,
282-
const_expressions: HandleMap<crate::Expression>,
282+
global_expressions: HandleMap<crate::Expression>,
283283
}
284284

285285
impl From<ModuleTracer<'_>> for ModuleMap {
286286
fn from(used: ModuleTracer) -> Self {
287287
ModuleMap {
288288
types: HandleMap::from_set(used.types_used),
289289
constants: HandleMap::from_set(used.constants_used),
290-
const_expressions: HandleMap::from_set(used.const_expressions_used),
290+
global_expressions: HandleMap::from_set(used.global_expressions_used),
291291
}
292292
}
293293
}

‎naga/src/front/glsl/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub struct Context<'a> {
7979
pub is_const: bool,
8080
/// Tracks the expression kind of `Expression`s residing in `self.expressions`
8181
pub local_expression_kind_tracker: crate::proc::ExpressionKindTracker,
82-
/// Tracks the expression kind of `Expression`s residing in `self.module.const_expressions`
82+
/// Tracks the expression kind of `Expression`s residing in `self.module.global_expressions`
8383
pub global_expression_kind_tracker: &'a mut crate::proc::ExpressionKindTracker,
8484
}
8585

@@ -1471,7 +1471,7 @@ impl Index<Handle<Expression>> for Context<'_> {
14711471

14721472
fn index(&self, index: Handle<Expression>) -> &Self::Output {
14731473
if self.is_const {
1474-
&self.module.const_expressions[index]
1474+
&self.module.global_expressions[index]
14751475
} else {
14761476
&self.expressions[index]
14771477
}

‎naga/src/front/glsl/parser/functions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl<'source> ParsingContext<'source> {
198198
ctx.global_expression_kind_tracker,
199199
)?;
200200

201-
match ctx.module.const_expressions[const_expr] {
201+
match ctx.module.global_expressions[const_expr] {
202202
Expression::Literal(Literal::I32(value)) => match uint {
203203
// This unchecked cast isn't good, but since
204204
// we only reach this code when the selector

0 commit comments

Comments
 (0)