[tint][glsl] Move TextureBuiltinFromUniform after binding remapping.
This is necessary to move it after DirectVariableAccess, which
simplifies the code of TextureBuiltinFromUniform and makes it easier to
add binding_array support in the future.
Concrete changes are:
- Move TextureBuiltinFromUniform after DirectVariableAccess and after
the BindingRemapper in GLSL's raise.cc.
- Update the options of TexturnBuiltinFromUniform to use BindingInfo
(for post-remaapping indices) instead of BindingPoint
(pre-remapping), as well as places where this options are used
(tests, GenerateBindings, CanGenerate).
- Update ShaderModuleGL to produce post-remapping BindingInfo for
TextureBuiltinFromUniform options.
- Simplify TextureBuiltinFromUniform by removing the handling of
function parameters now that it runs after DirectVariableAccess.
(this logic was untested anyway).
- Make the Tint inspector skip reporting ExternalTexture as needing
metadata for textureDimensions as the dimensions come from the
ExternalTexture UBO already.
- Update tests for the GLSL output changes caused by the reordering of
the transforms.
Bug: 411460085
Change-Id: Ica12f6140bf88c2ba858721986a8d9fdbf48461f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/248334
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/dawn/native/opengl/ShaderModuleGL.cpp b/src/dawn/native/opengl/ShaderModuleGL.cpp
index e4c04c7..97cd2e2 100644
--- a/src/dawn/native/opengl/ShaderModuleGL.cpp
+++ b/src/dawn/native/opengl/ShaderModuleGL.cpp
@@ -188,22 +188,36 @@
}
// Returns whether the stage uses any texture builtin metadata.
-bool GenerateTextureBuiltinFromUniformData(
+void GenerateTextureBuiltinFromUniformData(
const EntryPointMetadata& metadata,
const PipelineLayout* layout,
+ const tint::glsl::writer::Bindings& bindings,
BindingPointToFunctionAndOffset* bindingPointToData,
tint::glsl::writer::TextureBuiltinsFromUniformOptions* textureBuiltinsFromUniform) {
+ // Tell Tint where the uniform containing the builtin data will be (in post-remapping space),
+ // only when this shader stage uses some builtin metadata.
+ if (!metadata.textureQueries.empty()) {
+ textureBuiltinsFromUniform->ubo_binding = {
+ layout->GetInternalTextureBuiltinsUniformBinding()};
+ }
+
for (auto [i, query] : Enumerate(metadata.textureQueries)) {
- // Tint uses WGSL binding points for textureBuiltinFromUniform options.
+ const auto* bgl = layout->GetBindGroupLayout(BindGroupIndex{query.group});
+ BindingIndex binding = bgl->GetBindingIndex(BindingNumber{query.binding});
tint::BindingPoint wgslBindPoint = {.group = query.group, .binding = query.binding};
- textureBuiltinsFromUniform->ubo_bindingpoint_ordering.emplace_back(wgslBindPoint);
+
+ // Tint uses post-remapping binding points for textureBuiltinFromUniform options.
+ tint::glsl::writer::binding::BindingInfo remappedBinding;
+ if (bindings.texture.contains(wgslBindPoint)) {
+ remappedBinding = bindings.texture.at(wgslBindPoint);
+ } else {
+ remappedBinding = bindings.storage_texture.at(wgslBindPoint);
+ }
+ textureBuiltinsFromUniform->ubo_bindingpoint_ordering.emplace_back(remappedBinding);
// Dawn uses (BindGroupIndex, BindingIndex) to know which builtin data needs to be passed as
// uniform. Convert the WGSL bind point to that.
- const BindGroupLayoutInternalBase* bgl =
- layout->GetBindGroupLayout(BindGroupIndex{query.group});
- tint::BindingPoint dstBindingPoint = tint::BindingPoint{
- query.group, uint32_t(bgl->GetBindingIndex(BindingNumber{query.binding}))};
+ tint::BindingPoint dstBindingPoint = {query.group, uint32_t(binding)};
BindPointFunction type;
switch (query.type) {
@@ -225,8 +239,6 @@
bindingPointToData->emplace(dstBindingPoint,
std::pair{type, static_cast<uint32_t>(i * sizeof(uint32_t))});
}
-
- return !metadata.textureQueries.empty();
}
bool GenerateArrayLengthFromuniformData(const BindingInfoArray& moduleBindingInfo,
@@ -467,19 +479,9 @@
// entries.
{
tint::glsl::writer::TextureBuiltinsFromUniformOptions textureBuiltinsFromUniform;
- bool stageNeedsEmulatedBuiltins = GenerateTextureBuiltinFromUniformData(
- entryPointMetaData, layout, bindingPointToData, &textureBuiltinsFromUniform);
-
- // Tell Tint where the uniform containing the builtin data is, and where to remap it.
+ GenerateTextureBuiltinFromUniformData(entryPointMetaData, layout, bindings,
+ bindingPointToData, &textureBuiltinsFromUniform);
bindings.texture_builtins_from_uniform = std::move(textureBuiltinsFromUniform);
- if (stageNeedsEmulatedBuiltins) {
- DAWN_ASSERT(!bindingPointToData->empty());
-
- bindings.texture_builtins_from_uniform.ubo_binding = {kMaxBindGroups + 1, 0};
- bindings.uniform.emplace(bindings.texture_builtins_from_uniform.ubo_binding,
- tint::glsl::writer::binding::Uniform{
- layout->GetInternalTextureBuiltinsUniformBinding()});
- }
}
req.stage = stage;
diff --git a/src/tint/lang/glsl/writer/builtin_test.cc b/src/tint/lang/glsl/writer/builtin_test.cc
index 11f11ba..3756d01 100644
--- a/src/tint/lang/glsl/writer/builtin_test.cc
+++ b/src/tint/lang/glsl/writer/builtin_test.cc
@@ -877,24 +877,20 @@
});
Options opts{};
- opts.bindings.texture_builtins_from_uniform.ubo_binding = {0, 1};
- opts.bindings.texture_builtins_from_uniform.ubo_bindingpoint_ordering = {{0, 0}};
+ opts.bindings.texture[{0, 0}] = {0};
+ opts.bindings.texture_builtins_from_uniform.ubo_binding = {0};
+ opts.bindings.texture_builtins_from_uniform.ubo_bindingpoint_ordering = {{0}};
ASSERT_TRUE(Generate(opts)) << err_ << output_.glsl;
EXPECT_EQ(output_.glsl, GlslHeader() + R"(precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
+layout(binding = 0, std140)
+uniform f_TintTextureUniformData_ubo {
uint tint_builtin_value_0;
-};
-
-layout(binding = 1, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
} v_1;
uniform highp sampler2D f_v;
void main() {
- uvec2 x = uvec2(textureSize(f_v, int(min(3u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 x = uvec2(textureSize(f_v, int(min(3u, (v_1.tint_builtin_value_0 - 1u)))));
}
)");
}
diff --git a/src/tint/lang/glsl/writer/common/options.h b/src/tint/lang/glsl/writer/common/options.h
index 72dac3e..4e42adf 100644
--- a/src/tint/lang/glsl/writer/common/options.h
+++ b/src/tint/lang/glsl/writer/common/options.h
@@ -162,13 +162,13 @@
/// Options used to specify a mapping of binding points to indices into a UBO
/// from which to load texture builtin values.
struct TextureBuiltinsFromUniformOptions {
- /// The binding point to use to generate a uniform buffer from which to read
- /// texture builtin values.
- BindingPoint ubo_binding = {};
+ /// The binding point to use to generate a uniform buffer from which to read texture builtin
+ /// values. Note that this is a post-remapping binding.
+ binding::Uniform ubo_binding = {};
- /// Ordered list of binding points in the uniform buffer for polyfilling `textureNumSamples` and
- /// `textureNumLevels`
- std::vector<BindingPoint> ubo_bindingpoint_ordering = {};
+ /// Ordered list of post-remapping bindings in the uniform buffer for polyfilling
+ /// `textureNumSamples` and `textureNumLevels`.
+ std::vector<binding::Texture> ubo_bindingpoint_ordering = {};
/// Reflect the fields of this class so that it can be used by tint::ForeachField()
TINT_REFLECT(TextureBuiltinsFromUniformOptions, ubo_binding, ubo_bindingpoint_ordering);
diff --git a/src/tint/lang/glsl/writer/helpers/generate_bindings.cc b/src/tint/lang/glsl/writer/helpers/generate_bindings.cc
index 5d240db..b3bef11 100644
--- a/src/tint/lang/glsl/writer/helpers/generate_bindings.cc
+++ b/src/tint/lang/glsl/writer/helpers/generate_bindings.cc
@@ -47,8 +47,7 @@
std::unordered_set<tint::BindingPoint> seen_binding_points;
// Set a binding point for the texture-builtins-from-uniform buffer.
- constexpr uint32_t kMaxBindGroups = 4u;
- bindings.texture_builtins_from_uniform.ubo_binding = {kMaxBindGroups, 0u};
+ bindings.texture_builtins_from_uniform.ubo_binding = {0u};
// Collect next valid binding number per group
Hashmap<uint32_t, uint32_t, 4> group_to_next_binding_number;
@@ -68,11 +67,6 @@
auto* ptr_type = var->Result()->Type()->As<core::type::Pointer>();
- // Add all texture variables to the texture-builtin-from-uniform map.
- if (ptr_type->StoreType()->Is<core::type::Texture>()) {
- bindings.texture_builtins_from_uniform.ubo_bindingpoint_ordering.emplace_back(*bp);
- }
-
// Store up the external textures, we'll add them in the next step
if (ptr_type->StoreType()->Is<core::type::ExternalTexture>()) {
ext_tex_bps.Push(*bp);
@@ -88,7 +82,12 @@
[&](const core::type::StorageTexture*) {
bindings.storage_texture.emplace(*bp, info);
},
- [&](const core::type::Texture*) { bindings.texture.emplace(*bp, info); });
+ [&](const core::type::Texture*) {
+ bindings.texture.emplace(*bp, info);
+ // Add all texture variables to the texture-builtin-from-uniform map.
+ bindings.texture_builtins_from_uniform.ubo_bindingpoint_ordering
+ .emplace_back(info);
+ });
break;
case core::AddressSpace::kStorage:
bindings.storage.emplace(*bp, info);
diff --git a/src/tint/lang/glsl/writer/raise/raise.cc b/src/tint/lang/glsl/writer/raise/raise.cc
index c36b235..2baba12 100644
--- a/src/tint/lang/glsl/writer/raise/raise.cc
+++ b/src/tint/lang/glsl/writer/raise/raise.cc
@@ -107,11 +107,6 @@
return immediate_data_layout.Failure();
}
- // Note, this comes before binding remapper as Dawn inserts _pre-remapping_ binding information.
- // So, in order to move this later we'd need to update Dawn to send the _post-remapping_ data.
- RUN_TRANSFORM(raise::TextureBuiltinsFromUniform, module,
- options.bindings.texture_builtins_from_uniform);
-
// Note, this must come after Robustness as it may add `arrayLength`.
// This also needs to come before binding remapper as Dawn inserts _pre-remapping_ binding
// information. So, in order to move this later we'd need to update Dawn to send the
@@ -176,6 +171,12 @@
RUN_TRANSFORM(core::ir::transform::DirectVariableAccess, module, dva_config);
}
+ // Note, this must come after remapping as it uses post-remapping indices for its options.
+ // Note, this must come after DirectVariableAccess as it doesn't handle tracing through function
+ // calls.
+ RUN_TRANSFORM(raise::TextureBuiltinsFromUniform, module,
+ options.bindings.texture_builtins_from_uniform);
+
if (!options.disable_workgroup_init) {
RUN_TRANSFORM(core::ir::transform::ZeroInitWorkgroupMemory, module);
}
diff --git a/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform.cc b/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform.cc
index 8db0504..8b7f8e6 100644
--- a/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform.cc
+++ b/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform.cc
@@ -57,7 +57,7 @@
core::ir::Var* texture_uniform_data_ = nullptr;
/// Map from binding point to index into uniform structure
- Hashmap<BindingPoint, uint32_t, 2> binding_point_to_uniform_idx_{};
+ Hashmap<binding::BindingInfo, uint32_t, 2> binding_point_to_uniform_index_{};
/// Maps from a function parameter to the replacement function parameter for texture uniform
/// data
@@ -104,7 +104,7 @@
members.Reserve(count);
for (uint32_t i = 0; i < count; ++i) {
members.Push({ir.symbols.New("tint_builtin_value_" + std::to_string(i)), ty.u32()});
- binding_point_to_uniform_idx_.Add(cfg.ubo_bindingpoint_ordering[i], i);
+ binding_point_to_uniform_index_.Add(cfg.ubo_bindingpoint_ordering[i], i);
}
auto* strct =
@@ -112,77 +112,32 @@
b.Append(ir.root_block, [&] {
texture_uniform_data_ = b.Var(ty.ptr(uniform, strct, read));
- texture_uniform_data_->SetBindingPoint(cfg.ubo_binding.group, cfg.ubo_binding.binding);
+ texture_uniform_data_->SetBindingPoint(0, cfg.ubo_binding.binding);
});
}
// Note, assumes is called inside an insert block
- core::ir::Access* GetUniformValue(const BindingPoint& binding) {
- TINT_ASSERT(binding_point_to_uniform_idx_.Contains(binding));
-
- uint32_t idx = *binding_point_to_uniform_idx_.Get(binding);
- return b.Access(ty.ptr<uniform, u32, read>(), texture_uniform_data_, u32(idx));
+ core::ir::Value* FindSource(core::ir::Value* val) {
+ return tint::Switch(
+ val->As<core::ir::InstructionResult>()->Instruction(),
+ [&](core::ir::Var* v) { return v->Result(); },
+ [&](core::ir::Load* l) { return FindSource(l->From()); }, TINT_ICE_ON_NO_MATCH);
}
- core::ir::Value* FindSource(core::ir::Value* tex) {
- core::ir::Value* res = nullptr;
- while (res == nullptr) {
- tint::Switch(
- tex,
- [&](core::ir::InstructionResult* r) {
- tint::Switch(
- r->Instruction(), //
- [&](core::ir::Var* v) { res = v->Result(); }, //
- [&](core::ir::Load* l) { tex = l->From(); }, //
- TINT_ICE_ON_NO_MATCH);
- },
- [&](core::ir::FunctionParam* fp) { res = fp; },
-
- TINT_ICE_ON_NO_MATCH);
- }
- return res;
- }
-
+ // Note, assumes is called inside an insert block
core::ir::Value* GetAccessFromUniform(core::ir::Value* arg) {
auto* src = FindSource(arg);
- return tint::Switch(
- src,
- [&](core::ir::InstructionResult* r) -> core::ir::Value* {
- if (auto* v = r->Instruction()->As<core::ir::Var>()) {
- auto* access = GetUniformValue(v->BindingPoint().value());
- return b.Load(access)->Result();
+ auto* inst = src->As<core::ir::InstructionResult>();
+ TINT_ASSERT(inst != nullptr);
+ auto* var = src->As<core::ir::InstructionResult>()->Instruction()->As<core::ir::Var>();
+ TINT_ASSERT(var != nullptr);
- } else {
- TINT_UNREACHABLE() << "invalid instruction type";
- }
- },
- [&](core::ir::FunctionParam* fp) { return AppendFunctionParam(fp); },
- TINT_ICE_ON_NO_MATCH);
- }
+ binding::BindingInfo binding = {var->BindingPoint()->binding};
+ TINT_ASSERT(binding_point_to_uniform_index_.Contains(binding));
+ uint32_t idx = *binding_point_to_uniform_index_.Get(binding);
- core::ir::Value* AppendFunctionParam(core::ir::FunctionParam* fp) {
- return texture_param_replacement_.GetOrAdd(fp, [&] {
- auto* new_param = b.FunctionParam("tint_tex_value", ty.u32());
- fp->Function()->AppendParam(new_param);
- texture_param_replacement_.Add(fp, new_param);
-
- AddUniformArgToCallSites(fp->Function(), fp->Index());
- return new_param;
- });
- }
-
- void AddUniformArgToCallSites(core::ir::Function* func, uint32_t tex_idx) {
- for (auto usage : func->UsagesUnsorted()) {
- auto* call = usage->instruction->As<core::ir::UserCall>();
- if (!call) {
- continue;
- }
-
- b.InsertBefore(call, [&] {
- auto* val = GetAccessFromUniform(call->Args()[tex_idx]);
- call->AppendArg(val);
- });
- }
+ auto* value_ptr = b.Access(ty.ptr<uniform, u32, read>(), texture_uniform_data_, u32(idx));
+ return b.Load(value_ptr)->Result();
}
void TextureFromUniform(core::ir::BuiltinCall* call) {
@@ -217,7 +172,8 @@
Result<SuccessType> TextureBuiltinsFromUniform(core::ir::Module& ir,
const TextureBuiltinsFromUniformOptions& cfg) {
- auto result = ValidateAndDumpIfNeeded(ir, "glsl.TextureBuiltinsFromUniform");
+ auto result = ValidateAndDumpIfNeeded(ir, "glsl.TextureBuiltinsFromUniform",
+ kTextureBuiltinFromUniformCapabilities);
if (result != Success) {
return result.Failure();
}
diff --git a/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform.h b/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform.h
index d84f911..8213ebe 100644
--- a/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform.h
+++ b/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform.h
@@ -28,6 +28,7 @@
#ifndef SRC_TINT_LANG_GLSL_WRITER_RAISE_TEXTURE_BUILTINS_FROM_UNIFORM_H_
#define SRC_TINT_LANG_GLSL_WRITER_RAISE_TEXTURE_BUILTINS_FROM_UNIFORM_H_
+#include "src/tint/lang/core/ir/validator.h"
#include "src/tint/lang/glsl/writer/common/options.h"
#include "src/tint/utils/result.h"
@@ -38,6 +39,10 @@
namespace tint::glsl::writer::raise {
+/// The capabilities that the transform can support.
+const core::ir::Capabilities kTextureBuiltinFromUniformCapabilities{
+ core::ir::Capability::kAllowDuplicateBindings};
+
/// TextureBuiltinsFromUniform is a transform that replaces texture builtin function
/// `textureNumLevels` and `textureNumSamples` which do not have GLSL equivalents with
/// values read from a uniform.
diff --git a/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform_test.cc b/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform_test.cc
index 2b292b6..3a30003 100644
--- a/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform_test.cc
+++ b/src/tint/lang/glsl/writer/raise/texture_builtins_from_uniform_test.cc
@@ -97,7 +97,7 @@
}
)";
- TextureBuiltinsFromUniformOptions cfg = {{0, 30u}, std::vector<BindingPoint>{{0, 0}}};
+ TextureBuiltinsFromUniformOptions cfg = {{30u}, {{0}}};
Run(TextureBuiltinsFromUniform, cfg);
EXPECT_EQ(expect, str());
}
@@ -151,7 +151,7 @@
}
)";
- TextureBuiltinsFromUniformOptions cfg = {{0, 30u}, std::vector<BindingPoint>{{0, 0}}};
+ TextureBuiltinsFromUniformOptions cfg = {{30u}, {{0}}};
Run(TextureBuiltinsFromUniform, cfg);
EXPECT_EQ(expect, str());
}
@@ -211,7 +211,7 @@
}
)";
- TextureBuiltinsFromUniformOptions cfg = {{0, 30u}, std::vector<BindingPoint>{{0, 0}}};
+ TextureBuiltinsFromUniformOptions cfg = {{30u}, {{0}}};
Run(TextureBuiltinsFromUniform, cfg);
EXPECT_EQ(expect, str());
}
@@ -271,7 +271,7 @@
}
)";
- TextureBuiltinsFromUniformOptions cfg = {{0, 30u}, std::vector<BindingPoint>{{0, 0}}};
+ TextureBuiltinsFromUniformOptions cfg = {{30u}, {{0}}};
Run(TextureBuiltinsFromUniform, cfg);
EXPECT_EQ(expect, str());
}
diff --git a/src/tint/lang/glsl/writer/writer.cc b/src/tint/lang/glsl/writer/writer.cc
index 641b593..38510e0 100644
--- a/src/tint/lang/glsl/writer/writer.cc
+++ b/src/tint/lang/glsl/writer/writer.cc
@@ -51,7 +51,9 @@
// Make sure that every texture variable is in the texture_builtins_from_uniform binding list,
// otherwise TextureBuiltinsFromUniform will fail.
- // Also make sure there is at most one user-declared immediate, and make a note of its size.
+ // TODO(https://issues.chromium.org/427172887) Be more precise for the
+ // texture_builtins_from_uniform checks. Also make sure there is at most one user-declared
+ // immediate, and make a note of its size.
uint32_t user_immediate_size = 0;
for (auto* inst : *ir.root_block) {
auto* var = inst->As<core::ir::Var>();
@@ -66,12 +68,14 @@
return Failure("pixel_local address space is not supported by the GLSL backend");
}
- if (ptr->StoreType()->Is<core::type::Texture>()) {
+ // Check texture types that need metadata for texture_builtins_from_uniform.
+ if (ptr->StoreType()->Is<core::type::Texture>() &&
+ !ptr->StoreType()->IsAnyOf<core::type::StorageTexture, core::type::ExternalTexture>()) {
bool found = false;
- auto binding_point = var->BindingPoint();
+ auto binding = options.bindings.texture.at(var->BindingPoint().value());
for (auto& bp :
options.bindings.texture_builtins_from_uniform.ubo_bindingpoint_ordering) {
- if (bp == binding_point) {
+ if (bp == binding) {
found = true;
break;
}
@@ -79,19 +83,19 @@
if (!found) {
return Failure("texture missing from texture_builtins_from_uniform list");
}
+ }
- // Check texel formats for read-write storage textures when targeting ES.
- if (options.version.IsES()) {
- if (auto* st = ptr->StoreType()->As<core::type::StorageTexture>()) {
- if (st->Access() == core::Access::kReadWrite) {
- switch (st->TexelFormat()) {
- case core::TexelFormat::kR32Float:
- case core::TexelFormat::kR32Sint:
- case core::TexelFormat::kR32Uint:
- break;
- default:
- return Failure("unsupported read-write storage texture format");
- }
+ // Check texel formats for read-write storage textures when targeting ES.
+ if (options.version.IsES()) {
+ if (auto* st = ptr->StoreType()->As<core::type::StorageTexture>()) {
+ if (st->Access() == core::Access::kReadWrite) {
+ switch (st->TexelFormat()) {
+ case core::TexelFormat::kR32Float:
+ case core::TexelFormat::kR32Sint:
+ case core::TexelFormat::kR32Uint:
+ break;
+ default:
+ return Failure("unsupported read-write storage texture format");
}
}
}
diff --git a/src/tint/lang/wgsl/inspector/inspector.cc b/src/tint/lang/wgsl/inspector/inspector.cc
index 875ed02..1cb23c1 100644
--- a/src/tint/lang/wgsl/inspector/inspector.cc
+++ b/src/tint/lang/wgsl/inspector/inspector.cc
@@ -570,7 +570,8 @@
// textureLoad uses textureNumLevels to clamp the level, unless the texture type
// doesn't support mipmapping.
uses_num_levels = !texture_type->IsAnyOf<core::type::MultisampledTexture,
- core::type::DepthMultisampledTexture>();
+ core::type::DepthMultisampledTexture,
+ core::type::ExternalTexture>();
metadata.has_texture_load_with_depth_texture |=
texture_type
->IsAnyOf<core::type::DepthTexture, core::type::DepthMultisampledTexture>();
diff --git a/src/tint/lang/wgsl/inspector/inspector_test.cc b/src/tint/lang/wgsl/inspector/inspector_test.cc
index 2e1e5d2..70cf121 100644
--- a/src/tint/lang/wgsl/inspector/inspector_test.cc
+++ b/src/tint/lang/wgsl/inspector/inspector_test.cc
@@ -3808,12 +3808,14 @@
@group(2) @binding(3) var tex1: texture_2d<f32>;
@group(1) @binding(4) var tex2: texture_multisampled_2d<f32>;
@group(0) @binding(1) var tex3: texture_2d<f32>;
+@group(0) @binding(8) var tex4: texture_external;
@compute @workgroup_size(1)
fn main() {
let num1 = textureLoad(tex1, vec2(0, 0), 0);
let num2 = textureLoad(tex2, vec2(0, 0), 0);
let num3 = textureLoad(tex3, vec2(0, 0), 0);
+ let num4 = textureLoad(tex4, vec2(0, 0));
})";
Inspector& inspector = Initialize(shader);
diff --git a/test/tint/bug/chromium/1405676.wgsl.expected.glsl b/test/tint/bug/chromium/1405676.wgsl.expected.glsl
index 1c889de..ace6b1c 100644
--- a/test/tint/bug/chromium/1405676.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/1405676.wgsl.expected.glsl
@@ -1,17 +1,12 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D arg_0;
void d() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(0), v_1);
uint v_3 = (uvec2(textureSize(arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
diff --git a/test/tint/bug/chromium/378541479.wgsl.expected.glsl b/test/tint/bug/chromium/378541479.wgsl.expected.glsl
index bb0ee27..dcee6c2 100644
--- a/test/tint/bug/chromium/378541479.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/378541479.wgsl.expected.glsl
@@ -1,10 +1,5 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
uniform level_block_1_ubo {
uint inner;
@@ -14,14 +9,14 @@
uvec2 inner;
} v_1;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_2;
uniform highp sampler2D tex;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
uvec2 v_3 = v_1.inner;
- uint v_4 = min(v.inner, (v_2.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(v.inner, (v_2.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(v_3, (uvec2(textureSize(tex, int(v_4))) - uvec2(1u))));
float res = texelFetch(tex, v_5, int(v_4)).x;
}
diff --git a/test/tint/bug/tint/349291130.wgsl.expected.glsl b/test/tint/bug/tint/349291130.wgsl.expected.glsl
index 227f748..61df1ae 100644
--- a/test/tint/bug/tint/349291130.wgsl.expected.glsl
+++ b/test/tint/bug/tint/349291130.wgsl.expected.glsl
@@ -1,19 +1,14 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
layout(local_size_x = 6, local_size_y = 1, local_size_z = 1) in;
void main() {
{
uvec2 tint_loop_idx = uvec2(4294967295u);
- uint level = v.inner.tint_builtin_value_0;
+ uint level = v.tint_builtin_value_0;
while(true) {
if (all(equal(tint_loop_idx, uvec2(0u)))) {
break;
diff --git a/test/tint/bug/tint/453.wgsl.expected.glsl b/test/tint/bug/tint/453.wgsl.expected.glsl
index a7b2343..e46b13b 100644
--- a/test/tint/bug/tint/453.wgsl.expected.glsl
+++ b/test/tint/bug/tint/453.wgsl.expected.glsl
@@ -1,21 +1,15 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
- uint tint_builtin_value_1;
-};
-
layout(binding = 1, r32ui) uniform highp writeonly uimage2D Dst;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D Src;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
uvec4 srcValue = uvec4(0u);
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(0), v_1);
uvec2 v_3 = (uvec2(textureSize(Src, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(0)), v_3));
diff --git a/test/tint/bug/tint/534.wgsl.expected.glsl b/test/tint/bug/tint/534.wgsl.expected.glsl
index 3c4c415..b413dccf 100644
--- a/test/tint/bug/tint/534.wgsl.expected.glsl
+++ b/test/tint/bug/tint/534.wgsl.expected.glsl
@@ -8,11 +8,6 @@
uint channelCount;
};
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
- uint tint_builtin_value_1;
-};
-
layout(binding = 2, std430)
buffer OutputBuf_1_ssbo {
uint result[];
@@ -22,8 +17,9 @@
Uniforms inner;
} v_1;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
+ uint tint_builtin_value_1;
} v_2;
uniform highp sampler2D src;
uniform highp sampler2D dst;
@@ -41,12 +37,12 @@
srcTexCoord.y = ((size.y - dstTexCoord.y) - 1u);
}
uvec2 v_3 = srcTexCoord;
- uint v_4 = (v_2.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_2.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(0), v_4);
ivec2 v_6 = ivec2(min(v_3, (uvec2(textureSize(src, int(v_5))) - uvec2(1u))));
vec4 srcColor = texelFetch(src, v_6, int(v_5));
uvec2 v_7 = dstTexCoord;
- uint v_8 = (v_2.inner.tint_builtin_value_1 - 1u);
+ uint v_8 = (v_2.tint_builtin_value_1 - 1u);
uint v_9 = min(uint(0), v_8);
ivec2 v_10 = ivec2(min(v_7, (uvec2(textureSize(dst, int(v_9))) - uvec2(1u))));
vec4 dstColor = texelFetch(dst, v_10, int(v_9));
diff --git a/test/tint/bug/tint/757.wgsl.expected.glsl b/test/tint/bug/tint/757.wgsl.expected.glsl
index c0b867c..e904d93 100644
--- a/test/tint/bug/tint/757.wgsl.expected.glsl
+++ b/test/tint/bug/tint/757.wgsl.expected.glsl
@@ -1,17 +1,12 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 3, std430)
buffer Result_1_ssbo {
float values[];
} result;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray myTexture;
void main_inner(uvec3 GlobalInvocationID) {
@@ -20,7 +15,7 @@
ivec2 v_1 = ivec2(GlobalInvocationID.xy);
uint v_2 = (uint(textureSize(myTexture, 0).z) - 1u);
uint v_3 = min(uint(0), v_2);
- uint v_4 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(0), v_4);
uvec2 v_6 = (uvec2(textureSize(myTexture, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(v_1), v_6));
diff --git a/test/tint/bug/tint/827.wgsl.expected.glsl b/test/tint/bug/tint/827.wgsl.expected.glsl
index 2179ec6..c60e5a4 100644
--- a/test/tint/bug/tint/827.wgsl.expected.glsl
+++ b/test/tint/bug/tint/827.wgsl.expected.glsl
@@ -1,24 +1,19 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 1, std430)
buffer Result_1_ssbo {
float values[];
} result;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D tex;
void main_inner(uvec3 GlobalInvocationId) {
uint v_1 = min(((GlobalInvocationId.y * 128u) + GlobalInvocationId.x), (uint(result.values.length()) - 1u));
int v_2 = int(GlobalInvocationId.x);
ivec2 v_3 = ivec2(v_2, int(GlobalInvocationId.y));
- uint v_4 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(0), v_4);
uvec2 v_6 = (uvec2(textureSize(tex, int(v_5))) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(v_3), v_6));
diff --git a/test/tint/bug/tint/913.wgsl.expected.glsl b/test/tint/bug/tint/913.wgsl.expected.glsl
index 08159d2..af91448 100644
--- a/test/tint/bug/tint/913.wgsl.expected.glsl
+++ b/test/tint/bug/tint/913.wgsl.expected.glsl
@@ -9,11 +9,6 @@
uvec2 copySize;
};
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
- uint tint_builtin_value_1;
-};
-
layout(binding = 2, std430)
buffer OutputBuf_1_ssbo {
uint result[];
@@ -23,8 +18,9 @@
Uniforms inner;
} v_1;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
+ uint tint_builtin_value_1;
} v_2;
uniform highp sampler2D src;
uniform highp sampler2D dst;
@@ -59,7 +55,7 @@
bool v_6 = false;
if (success) {
ivec2 v_7 = ivec2(dstTexCoord);
- uint v_8 = (v_2.inner.tint_builtin_value_1 - 1u);
+ uint v_8 = (v_2.tint_builtin_value_1 - 1u);
uint v_9 = min(uint(0), v_8);
uvec2 v_10 = (uvec2(textureSize(dst, int(v_9))) - uvec2(1u));
ivec2 v_11 = ivec2(min(uvec2(v_7), v_10));
@@ -74,13 +70,13 @@
srcTexCoord.y = ((srcSize.y - srcTexCoord.y) - 1u);
}
ivec2 v_12 = ivec2(srcTexCoord);
- uint v_13 = (v_2.inner.tint_builtin_value_0 - 1u);
+ uint v_13 = (v_2.tint_builtin_value_0 - 1u);
uint v_14 = min(uint(0), v_13);
uvec2 v_15 = (uvec2(textureSize(src, int(v_14))) - uvec2(1u));
ivec2 v_16 = ivec2(min(uvec2(v_12), v_15));
vec4 srcColor = texelFetch(src, v_16, int(v_14));
ivec2 v_17 = ivec2(dstTexCoord);
- uint v_18 = (v_2.inner.tint_builtin_value_1 - 1u);
+ uint v_18 = (v_2.tint_builtin_value_1 - 1u);
uint v_19 = min(uint(0), v_18);
uvec2 v_20 = (uvec2(textureSize(dst, int(v_19))) - uvec2(1u));
ivec2 v_21 = ivec2(min(uvec2(v_17), v_20));
diff --git a/test/tint/bug/tint/942.wgsl.expected.glsl b/test/tint/bug/tint/942.wgsl.expected.glsl
index cc4fa8f..71de66c 100644
--- a/test/tint/bug/tint/942.wgsl.expected.glsl
+++ b/test/tint/bug/tint/942.wgsl.expected.glsl
@@ -10,11 +10,6 @@
uint value;
};
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
- uint tint_builtin_value_1;
-};
-
layout(binding = 1, std140)
uniform params_block_1_ubo {
Params inner;
@@ -26,8 +21,8 @@
} v_1;
shared vec3 tile[4][256];
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_2;
uniform highp sampler2D inputTex_samp;
uint tint_div_u32(uint lhs, uint rhs) {
@@ -51,7 +46,7 @@
}
barrier();
uint filterOffset = tint_div_u32((v.inner.filterDim - 1u), 2u);
- uint v_5 = (v_2.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v_2.tint_builtin_value_0 - 1u);
uvec2 dims = uvec2(textureSize(inputTex_samp, int(min(uint(0), v_5))));
uvec2 v_6 = ((WorkGroupID.xy * uvec2(v.inner.blockDim, 4u)) + (LocalInvocationID.xy * uvec2(4u, 1u)));
uvec2 baseIndex = (v_6 - uvec2(filterOffset, 0u));
diff --git a/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl
index e0970d9..dd06c52 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
uint textureDimensions_022903() {
- uint res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
uint textureDimensions_022903() {
- uint res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_022903() {
- uint res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u))))).x;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.glsl
index 67bb617..35438c9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
uvec3 textureDimensions_0890c6() {
- uvec3 res = uvec3(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
uvec3 textureDimensions_0890c6() {
- uvec3 res = uvec3(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_0890c6() {
- uvec3 res = uvec3(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.glsl
index 5621ae9..bd9648e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray f_arg_0;
uvec2 textureDimensions_0ff9a4() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -32,22 +27,17 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray arg_0;
uvec2 textureDimensions_0ff9a4() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -61,23 +51,19 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_0ff9a4() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.glsl
index ccdb4e4..25f1146 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uvec2 textureDimensions_13f8db() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uvec2 textureDimensions_13f8db() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_13f8db() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.glsl
index 0b13c7e..9f5003e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec2 textureDimensions_15b577() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec2 textureDimensions_15b577() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_15b577() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.glsl
index e32aecd..8e2b298 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
uvec3 textureDimensions_1bc428() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
uvec3 textureDimensions_1bc428() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_1bc428() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.glsl
index fa5acf5..f7f2ed4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uvec2 textureDimensions_1bd78c() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uvec2 textureDimensions_1bd78c() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_1bd78c() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.glsl
index 99c648e..498655b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCubeArray f_arg_0;
uvec2 textureDimensions_22b5b6() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -32,22 +27,17 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCubeArray arg_0;
uvec2 textureDimensions_22b5b6() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -61,23 +51,19 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usamplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_22b5b6() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.glsl
index f8666ae..5d01f64 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
uvec2 textureDimensions_2e443d() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
uvec2 textureDimensions_2e443d() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_2e443d() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.glsl
index 7c8af96..8951b3f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
uvec2 textureDimensions_2fd2a4() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
uvec2 textureDimensions_2fd2a4() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_2fd2a4() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.glsl
index 0f0b6a3..e1e2f70 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCubeArray f_arg_0;
uvec2 textureDimensions_346fee() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCubeArray arg_0;
uvec2 textureDimensions_346fee() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usamplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_346fee() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.glsl
index d9c5efe..b2520b0 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube f_arg_0;
uvec2 textureDimensions_382b16() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube arg_0;
uvec2 textureDimensions_382b16() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_382b16() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.glsl
index ccc7964..a183ab2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCubeArray f_arg_0;
uvec2 textureDimensions_3963d0() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCubeArray arg_0;
uvec2 textureDimensions_3963d0() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isamplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_3963d0() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.glsl
index 1e48a15..456cb79 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCubeArray f_arg_0;
uvec2 textureDimensions_3c66f0() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -32,22 +27,17 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCubeArray arg_0;
uvec2 textureDimensions_3c66f0() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -61,23 +51,19 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isamplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_3c66f0() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.glsl
index 12460b4..be42f9c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
uvec2 textureDimensions_3fc3dc() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
uvec2 textureDimensions_3fc3dc() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_3fc3dc() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.glsl
index ad1ba70..9a80020 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube f_arg_0;
uvec2 textureDimensions_49a067() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube arg_0;
uvec2 textureDimensions_49a067() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_49a067() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.glsl
index 74d9a0a..025d901 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec2 textureDimensions_528c0e() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec2 textureDimensions_528c0e() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_528c0e() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.glsl
index ec2e0d5..ee06277 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCube f_arg_0;
uvec2 textureDimensions_64dc74() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCube arg_0;
uvec2 textureDimensions_64dc74() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isamplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_64dc74() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.glsl
index e4b133b..76923f2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec3 textureDimensions_6e6c7a() {
- uvec3 res = uvec3(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec3 textureDimensions_6e6c7a() {
- uvec3 res = uvec3(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_6e6c7a() {
- uvec3 res = uvec3(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.glsl
index 10fe6c8..67db7bd 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uvec2 textureDimensions_6f1b5d() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uvec2 textureDimensions_6f1b5d() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_6f1b5d() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.glsl
index f590345..e214848 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
uvec3 textureDimensions_756031() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
uvec3 textureDimensions_756031() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_756031() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.glsl
index ea4581a..acf6f40 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube f_arg_0;
uvec2 textureDimensions_79d168() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube arg_0;
uvec2 textureDimensions_79d168() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_79d168() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl
index a3baa65..59f52ee 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uint textureDimensions_920006() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2)))).x;
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uint textureDimensions_920006() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(arg_0, int(min(uint(1), v_2)))).x;
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_920006() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1)))).x;
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.glsl
index c8e4797..270db3a 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uvec2 textureDimensions_991ea9() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uvec2 textureDimensions_991ea9() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_991ea9() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.glsl
index a363839..226cbfb 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCube f_arg_0;
uvec2 textureDimensions_9baf27() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCube arg_0;
uvec2 textureDimensions_9baf27() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usamplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_9baf27() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl
index bc9c6b8e..7e02411 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uint textureDimensions_9c7a00() {
- uint res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uint textureDimensions_9c7a00() {
- uint res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_9c7a00() {
- uint res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u))))).x;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.glsl
index 2a8248c..65abc25 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCube f_arg_0;
uvec2 textureDimensions_9cd4ca() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCube arg_0;
uvec2 textureDimensions_9cd4ca() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usamplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_9cd4ca() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.glsl
index 6d2a6d6..dd8d2a7 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec2 textureDimensions_9e0794() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec2 textureDimensions_9e0794() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_9e0794() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.glsl
index 00e6b5b..f379375 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCube f_arg_0;
uvec2 textureDimensions_a2ba5e() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCube arg_0;
uvec2 textureDimensions_a2ba5e() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isamplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_a2ba5e() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.glsl
index de6a559..d1512fc 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
uvec2 textureDimensions_a48049() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
uvec2 textureDimensions_a48049() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_a48049() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl
index 81c8f2e..08c8f16 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uint textureDimensions_aac604() {
- uint res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uint textureDimensions_aac604() {
- uint res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_aac604() {
- uint res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u))))).x;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.glsl
index 3f01ef8..711f98a 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray f_arg_0;
uvec2 textureDimensions_b3ab5e() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -32,22 +27,17 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray arg_0;
uvec2 textureDimensions_b3ab5e() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -61,23 +51,19 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_b3ab5e() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl
index 0e52376..a5f34a2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
uint textureDimensions_b46d97() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2)))).x;
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
uint textureDimensions_b46d97() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(arg_0, int(min(uint(1), v_2)))).x;
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_b46d97() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1)))).x;
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.glsl
index a20b8a9..4b080f4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray f_arg_0;
uvec2 textureDimensions_bd94c8() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray arg_0;
uvec2 textureDimensions_bd94c8() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_bd94c8() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.glsl
index fe03f13..5652fdc 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
uvec3 textureDimensions_c871f3() {
- uvec3 res = uvec3(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
uvec3 textureDimensions_c871f3() {
- uvec3 res = uvec3(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_c871f3() {
- uvec3 res = uvec3(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.glsl
index 6b1ec6c..e11bc51 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray f_arg_0;
uvec2 textureDimensions_cf2b50() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray arg_0;
uvec2 textureDimensions_cf2b50() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_cf2b50() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.glsl
index 4c9546b..c9269dd 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube f_arg_0;
uvec2 textureDimensions_d3accd() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube arg_0;
uvec2 textureDimensions_d3accd() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_d3accd() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.glsl
index 2b1a2dd..9f32c11 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
uvec2 textureDimensions_dfdc32() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
uvec2 textureDimensions_dfdc32() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_dfdc32() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.glsl
index 89f3cde..fdb357e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec2 textureDimensions_e18a8b() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec2 textureDimensions_e18a8b() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_e18a8b() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.glsl
index 0b104ff..cb04e6f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
uvec2 textureDimensions_e4e310() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
uvec2 textureDimensions_e4e310() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_e4e310() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.glsl
index 95c5697..ea13495 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec3 textureDimensions_e5a203() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(f_arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec3 textureDimensions_e5a203() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(arg_0, int(min(uint(1), v_2))));
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_e5a203() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(v_arg_0, int(min(uint(1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.glsl
index 067fd03..d7d9bec 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
uvec2 textureDimensions_eafe19() {
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -31,22 +26,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
uvec2 textureDimensions_eafe19() {
- uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(1u, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -59,23 +49,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_eafe19() {
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(1u, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl
index 83b5066..e94ac0d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uint textureDimensions_f17acd() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2)))).x;
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uint textureDimensions_f17acd() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(arg_0, int(min(uint(1), v_2)))).x;
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_f17acd() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1)))).x;
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.glsl
index a479511..da75992 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
uvec2 textureDimensions_fdf6e9() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -32,22 +27,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
uvec2 textureDimensions_fdf6e9() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(1), v_2))).xy);
return res;
}
@@ -61,23 +51,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_fdf6e9() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.glsl
index ae91614..fa94da8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
vec4 textureLoad_019da0() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(f_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
vec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
vec4 textureLoad_019da0() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
vec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_019da0() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec3 v_2 = (uvec3(textureSize(v_arg_0, int(v_1))) - uvec3(1u));
ivec3 v_3 = ivec3(min(uvec3(ivec3(1)), v_2));
vec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.glsl
index 393062b..945e818 100644
--- a/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_026217() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -36,23 +31,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_026217() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -69,24 +59,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_026217() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.glsl
index 17a9cbe..ce39a26 100644
--- a/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_04b911() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_3));
float res = texelFetch(f_arg_0, v_6, int(v_4)).x;
@@ -36,24 +31,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_04b911() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_3));
float res = texelFetch(arg_0, v_6, int(v_4)).x;
@@ -69,25 +59,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_04b911() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
float res = texelFetch(v_arg_0, v_5, int(v_3)).x;
diff --git a/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl
index f26e52a..453fedc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_0cb698() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(f_arg_0, int(v_2))).x - 1u)), 0u));
ivec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_0cb698() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(arg_0, int(v_2))).x - 1u)), 0u));
ivec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_0cb698() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_2 = ivec2(uvec2(min(1u, (uvec2(textureSize(v_arg_0, int(v_1))).x - 1u)), 0u));
ivec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl
index ef457c9..31423fb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_1373dc() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(uvec2(min(1u, (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u)), 0u));
vec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_1373dc() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(uvec2(min(1u, (uvec2(textureSize(arg_0, int(v_3))).x - 1u)), 0u));
vec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_1373dc() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u)), 0u));
vec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.glsl
index 3152e28..84610d6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_168dc8() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
ivec2 v_6 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -37,24 +32,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_168dc8() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
ivec2 v_6 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -71,25 +61,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_168dc8() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl
index b70039b..406db5a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
float textureLoad_19cf87() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
float textureLoad_19cf87() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_19cf87() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.glsl
index 1d9bfb3..9410f65 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_1b051f() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -36,23 +31,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_1b051f() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -69,24 +59,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_1b051f() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2)).xy) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
ivec3 v_5 = ivec3(v_4, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
index 997752b..1cb7dc9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_1b8588() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uint v_4 = (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(1), v_4), 0u));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_1b8588() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uint v_4 = (uvec2(textureSize(arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(1), v_4), 0u));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_1b8588() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uint v_3 = (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
diff --git a/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.glsl
index d3f9044..c1f7ea3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec4 textureLoad_1c562a() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(f_arg_0, int(v_2))) - uvec3(1u))));
uvec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec4 textureLoad_1c562a() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(arg_0, int(v_2))) - uvec3(1u))));
uvec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_1c562a() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec3 v_2 = ivec3(min(uvec3(1u), (uvec3(textureSize(v_arg_0, int(v_1))) - uvec3(1u))));
uvec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl
index b289ea8..eb58789 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
vec4 textureLoad_1f2016() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec3 v_4 = (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(ivec3(1)), v_4));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
vec4 textureLoad_1f2016() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec3 v_4 = (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(ivec3(1)), v_4));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_1f2016() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uvec3 v_3 = (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl
index 446e545..b66de3b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_216c37() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(uvec2(min(1u, (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u)), 0u));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_216c37() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(uvec2(min(1u, (uvec2(textureSize(arg_0, int(v_3))).x - 1u)), 0u));
uvec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_216c37() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u)), 0u));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.glsl
index 1307d96..b25fefd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
vec4 textureLoad_21d1c4() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(f_arg_0, int(v_2))) - uvec3(1u))));
vec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
vec4 textureLoad_21d1c4() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(arg_0, int(v_2))) - uvec3(1u))));
vec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_21d1c4() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec3 v_2 = ivec3(min(uvec3(1u), (uvec3(textureSize(v_arg_0, int(v_1))) - uvec3(1u))));
vec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.glsl
index 99d5faf..41390f4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
ivec4 textureLoad_223246() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec3 v_4 = ivec3(min(uvec3(1u), (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u))));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
ivec4 textureLoad_223246() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec3 v_4 = ivec3(min(uvec3(1u), (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u))));
ivec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_223246() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u))));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.glsl
index e8fd54c..98c2fc3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_2363be() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_3));
ivec4 res = texelFetch(f_arg_0, v_6, int(v_4));
@@ -36,24 +31,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_2363be() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_3));
ivec4 res = texelFetch(arg_0, v_6, int(v_4));
@@ -69,25 +59,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_2363be() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
ivec4 res = texelFetch(v_arg_0, v_5, int(v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.glsl
index 8c6e3d4..9c61226 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_2d479c() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
vec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_2d479c() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
vec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_2d479c() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_2 = (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u));
ivec2 v_3 = ivec2(min(uvec2(ivec2(1)), v_2));
vec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.glsl
index 97865d6..c5ebddc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_3c96e8() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -36,23 +31,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_3c96e8() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -69,24 +59,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_3c96e8() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2)).xy) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
ivec3 v_5 = ivec3(v_4, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.glsl
index c6be40b..e4df300 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_3d3fd1() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -36,23 +31,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_3d3fd1() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -69,24 +59,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_3d3fd1() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl
index 2335638..2026c0b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_3da3ed() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(f_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
vec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_3da3ed() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
vec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_3da3ed() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uint v_2 = (uvec2(textureSize(v_arg_0, int(v_1))).x - 1u);
ivec2 v_3 = ivec2(uvec2(min(uint(1), v_2), 0u));
vec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.glsl
index bf34eca..56c5805 100644
--- a/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_439e2a() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u))));
vec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_439e2a() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u))));
vec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_439e2a() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u))));
vec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.glsl
index 59aef87..5ddd708 100644
--- a/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_46a93f() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_3));
vec4 res = texelFetch(f_arg_0, v_6, int(v_4));
@@ -36,24 +31,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_46a93f() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_3));
vec4 res = texelFetch(arg_0, v_6, int(v_4));
@@ -69,25 +59,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_46a93f() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
vec4 res = texelFetch(v_arg_0, v_5, int(v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.glsl
index fb49d50..4c6523d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
ivec4 textureLoad_47e818() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(f_arg_0, int(v_2))) - uvec3(1u))));
ivec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
ivec4 textureLoad_47e818() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(arg_0, int(v_2))) - uvec3(1u))));
ivec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_47e818() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec3 v_2 = ivec3(min(uvec3(1u), (uvec3(textureSize(v_arg_0, int(v_1))) - uvec3(1u))));
ivec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl
index a7cf906..115e18b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_484344() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_484344() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_484344() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.glsl
index 1da7c9e..423c5fc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_4acb64() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
@@ -37,23 +32,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_4acb64() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
@@ -71,24 +61,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_4acb64() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
diff --git a/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl
index 29a6897..0bd44fa 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_4c423f() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(uvec2(min(1u, (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u)), 0u));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_4c423f() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(uvec2(min(1u, (uvec2(textureSize(arg_0, int(v_3))).x - 1u)), 0u));
ivec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_4c423f() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u)), 0u));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl
index 09ee79f..1835544 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
ivec4 textureLoad_4fd803() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec3 v_4 = (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(ivec3(1)), v_4));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
ivec4 textureLoad_4fd803() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec3 v_4 = (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(ivec3(1)), v_4));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_4fd803() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uvec3 v_3 = (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.glsl
index e07ce51..52eeaff 100644
--- a/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_53e142() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
ivec2 v_6 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -37,24 +32,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_53e142() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
ivec2 v_6 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -71,25 +61,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_53e142() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.glsl
index 41764f8..7998164 100644
--- a/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_54a59b() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
ivec2 v_6 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -37,24 +32,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_54a59b() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
ivec2 v_6 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -71,25 +61,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_54a59b() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
index 83bd75b..ba74b09 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_5a2f9d() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uint v_4 = (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(1), v_4), 0u));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_5a2f9d() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uint v_4 = (uvec2(textureSize(arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(1), v_4), 0u));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_5a2f9d() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uint v_3 = (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
diff --git a/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl
index 2e6da36..58f0972 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_6154d4() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_6154d4() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_6154d4() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl
index a8c4438..2c949a5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_62d1de() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(f_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_62d1de() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
ivec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_62d1de() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uint v_2 = (uvec2(textureSize(v_arg_0, int(v_1))).x - 1u);
ivec2 v_3 = ivec2(uvec2(min(uint(1), v_2), 0u));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.glsl
index bcf7420..a996157 100644
--- a/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_656d76() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -37,24 +32,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_656d76() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -71,25 +61,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_656d76() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.glsl
index 62b1f38..b2d8992 100644
--- a/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_66be47() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -36,23 +31,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_66be47() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -69,24 +59,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_66be47() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2)).xy) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
ivec3 v_5 = ivec3(v_4, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl
index 377cb78..5a9d76e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_6b77d4() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(f_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_6b77d4() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
uvec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_6b77d4() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uint v_2 = (uvec2(textureSize(v_arg_0, int(v_1))).x - 1u);
ivec2 v_3 = ivec2(uvec2(min(uint(1), v_2), 0u));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.glsl
index bacb01f..3c8cffb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec4 textureLoad_6bf4b7() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(f_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec4 textureLoad_6bf4b7() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
uvec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_6bf4b7() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec3 v_2 = (uvec3(textureSize(v_arg_0, int(v_1))) - uvec3(1u));
ivec3 v_3 = ivec3(min(uvec3(ivec3(1)), v_2));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl
index b7cda48..e62eace 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_6d376a() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(f_arg_0, int(v_2))).x - 1u)), 0u));
vec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_6d376a() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(arg_0, int(v_2))).x - 1u)), 0u));
vec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_6d376a() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_2 = ivec2(uvec2(min(1u, (uvec2(textureSize(v_arg_0, int(v_1))).x - 1u)), 0u));
vec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.glsl
index 74d451e..5cc4ba6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_714471() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u))));
ivec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_714471() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u))));
ivec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_714471() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_2 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u))));
ivec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.glsl
index 93688ce..b9a01b6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_789045() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -37,24 +32,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_789045() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -71,25 +61,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_789045() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl
index 3cd4f78..5d84bda 100644
--- a/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_79e697() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
uvec2 v_6 = (uvec2(textureSize(f_arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(ivec2(1)), v_6));
@@ -38,24 +33,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_79e697() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
uvec2 v_6 = (uvec2(textureSize(arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(ivec2(1)), v_6));
@@ -73,25 +63,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_79e697() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(v_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
diff --git a/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.glsl
index c3cddff..121a56c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_7ab4df() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
@@ -37,23 +32,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_7ab4df() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
@@ -71,24 +61,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_7ab4df() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
diff --git a/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.glsl
index 2fb0897..31a11a1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_7b63e0() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
float res = texelFetch(f_arg_0, v_5, int(v_3)).x;
@@ -35,23 +30,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_7b63e0() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
float res = texelFetch(arg_0, v_5, int(v_3)).x;
@@ -67,24 +57,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_7b63e0() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_2)).xy) - uvec2(1u))));
ivec3 v_4 = ivec3(v_3, int(v_1));
float res = texelFetch(v_arg_0, v_4, int(v_2)).x;
diff --git a/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl
index 1d1a912..10e209b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_7c90e5() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
uvec2 v_6 = (uvec2(textureSize(f_arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(ivec2(1)), v_6));
@@ -38,24 +33,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_7c90e5() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
uvec2 v_6 = (uvec2(textureSize(arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(ivec2(1)), v_6));
@@ -73,25 +63,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_7c90e5() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(v_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
diff --git a/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.glsl
index b49ec9f..e80f8da 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
float textureLoad_7fd822() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u))));
float res = texelFetch(f_arg_0, v_4, int(v_3)).x;
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
float textureLoad_7fd822() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u))));
float res = texelFetch(arg_0, v_4, int(v_3)).x;
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_7fd822() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u))));
float res = texelFetch(v_arg_0, v_3, int(v_2)).x;
diff --git a/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
index a047f7e..3563bb3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_81c381() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uint v_4 = (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(1), v_4), 0u));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_81c381() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uint v_4 = (uvec2(textureSize(arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(1), v_4), 0u));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_81c381() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uint v_3 = (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(1), v_3), 0u));
diff --git a/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.glsl
index 90c462f..96c0ef3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_84dee1() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u))));
vec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_84dee1() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u))));
vec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_84dee1() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_2 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u))));
vec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.glsl
index 2f2a615..9ac6d8a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_8527b1() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
uvec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -35,23 +30,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_8527b1() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
uvec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -67,24 +57,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_8527b1() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_2)).xy) - uvec2(1u))));
ivec3 v_4 = ivec3(v_3, int(v_1));
uvec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl
index 048cd50..f7979a1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_87be85() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
uvec2 v_6 = (uvec2(textureSize(f_arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(ivec2(1)), v_6));
@@ -38,24 +33,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_87be85() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
uvec2 v_6 = (uvec2(textureSize(arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(ivec2(1)), v_6));
@@ -73,25 +63,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_87be85() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(v_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
diff --git a/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.glsl
index d5adefd..bf8fcfd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_897cf3() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u))));
uvec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_897cf3() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u))));
uvec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_897cf3() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_2 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u))));
uvec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.glsl
index 9105130..714dfae 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
float textureLoad_8ccbe3() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
float res = texelFetch(f_arg_0, v_4, int(v_2)).x;
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
float textureLoad_8ccbe3() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
float res = texelFetch(arg_0, v_4, int(v_2)).x;
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_8ccbe3() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_2 = (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u));
ivec2 v_3 = ivec2(min(uvec2(ivec2(1)), v_2));
float res = texelFetch(v_arg_0, v_3, int(v_1)).x;
diff --git a/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.glsl
index 0e01359..ab6afda 100644
--- a/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec4 textureLoad_92eb1f() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec3 v_4 = ivec3(min(uvec3(1u), (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u))));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec4 textureLoad_92eb1f() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec3 v_4 = ivec3(min(uvec3(1u), (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u))));
uvec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_92eb1f() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u))));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.glsl
index 9528c6e..fd0d4c7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_96efd5() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
vec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -35,23 +30,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_96efd5() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
vec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -67,24 +57,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_96efd5() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_2)).xy) - uvec2(1u))));
ivec3 v_4 = ivec3(v_3, int(v_1));
vec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.glsl
index 7ddda35..8ca6544 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_9885b0() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
ivec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -35,23 +30,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_9885b0() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
ivec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -67,24 +57,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_9885b0() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_2)).xy) - uvec2(1u))));
ivec3 v_4 = ivec3(v_3, int(v_1));
ivec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.glsl
index 6868cfb..72faa97 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_9aa733() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u))));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_9aa733() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u))));
ivec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_9aa733() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u))));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl
index cd5f06b..cd69873 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_9b2667() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
uvec2 v_6 = (uvec2(textureSize(f_arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(ivec2(1)), v_6));
@@ -38,24 +33,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_9b2667() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
uvec2 v_6 = (uvec2(textureSize(arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(ivec2(1)), v_6));
@@ -73,25 +63,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_9b2667() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(v_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
diff --git a/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.glsl
index 625a064..d108d96 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_9d70e9() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -37,24 +32,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_9d70e9() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -71,25 +61,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_9d70e9() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.glsl
index 9682305..c2c0a67 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
float textureLoad_9ed19e() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u))));
float res = texelFetch(f_arg_0, v_3, int(v_2)).x;
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
float textureLoad_9ed19e() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u))));
float res = texelFetch(arg_0, v_3, int(v_2)).x;
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_9ed19e() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_2 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u))));
float res = texelFetch(v_arg_0, v_2, int(v_1)).x;
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.glsl
index 82885dc..73a3ce6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_9fbfd9() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -36,23 +31,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_9fbfd9() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -69,24 +59,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_9fbfd9() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2)).xy) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
ivec3 v_5 = ivec3(v_4, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.glsl
index e548c33..9c30adb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_a24be1() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_3));
uvec4 res = texelFetch(f_arg_0, v_6, int(v_4));
@@ -36,24 +31,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_a24be1() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_3));
uvec4 res = texelFetch(arg_0, v_6, int(v_4));
@@ -69,25 +59,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_a24be1() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_2));
uvec4 res = texelFetch(v_arg_0, v_5, int(v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl
index e2b5aa3..5cdb417 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec4 textureLoad_a9a9f5() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec3 v_4 = (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(ivec3(1)), v_4));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec4 textureLoad_a9a9f5() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec3 v_4 = (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(ivec3(1)), v_4));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_a9a9f5() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uvec3 v_3 = (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.glsl
index 93774fd..5b3f6c2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_b29f71() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
@@ -37,23 +32,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_b29f71() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
@@ -71,24 +61,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_b29f71() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
diff --git a/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.glsl
index d8e8dba..5ac4ee7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_b6ba5d() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
ivec2 v_6 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -37,24 +32,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_b6ba5d() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_4 = (v_1.tint_builtin_value_0 - 1u);
uint v_5 = min(uint(1), v_4);
ivec2 v_6 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -71,25 +61,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_b6ba5d() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.glsl
index 40e0ccf..96026a5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_b73f6b() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u))));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_b73f6b() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u))));
uvec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_b73f6b() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec2 v_3 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u))));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl
index d4ff28e..2d920e7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_bc3201() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(f_arg_0, int(v_2))).x - 1u)), 0u));
uvec4 res = texelFetch(f_arg_0, v_3, int(v_2));
return res;
@@ -33,22 +28,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_bc3201() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(1u, (uvec2(textureSize(arg_0, int(v_2))).x - 1u)), 0u));
uvec4 res = texelFetch(arg_0, v_3, int(v_2));
return res;
@@ -63,23 +53,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_bc3201() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
ivec2 v_2 = ivec2(uvec2(min(1u, (uvec2(textureSize(v_arg_0, int(v_1))).x - 1u)), 0u));
uvec4 res = texelFetch(v_arg_0, v_2, int(v_1));
return res;
diff --git a/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.glsl
index 587c74b..0957443 100644
--- a/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
vec4 textureLoad_bcbb3c() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec3 v_4 = ivec3(min(uvec3(1u), (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u))));
vec4 res = texelFetch(f_arg_0, v_4, int(v_3));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
vec4 textureLoad_bcbb3c() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec3 v_4 = ivec3(min(uvec3(1u), (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u))));
vec4 res = texelFetch(arg_0, v_4, int(v_3));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_bcbb3c() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
ivec3 v_3 = ivec3(min(uvec3(1u), (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u))));
vec4 res = texelFetch(v_arg_0, v_3, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.glsl
index a6651f0..8602ed7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_c16e00() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
@@ -37,23 +32,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_c16e00() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
@@ -71,24 +61,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_c16e00() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
diff --git a/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl
index af31f1d..b8b1f73 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_c2a480() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
@@ -35,22 +30,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_c2a480() {
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
@@ -67,23 +57,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_c2a480() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint v_2 = min(uint(1), v_1);
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
diff --git a/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.glsl
index 4adea49..aac8893 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_cb57c2() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -36,23 +31,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_cb57c2() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -69,24 +59,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_cb57c2() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.glsl
index a0d1fec..d172bca 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
ivec4 textureLoad_e35f72() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(f_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
ivec4 textureLoad_e35f72() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(ivec3(1)), v_3));
ivec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_e35f72() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec3 v_2 = (uvec3(textureSize(v_arg_0, int(v_1))) - uvec3(1u));
ivec3 v_3 = ivec3(min(uvec3(ivec3(1)), v_2));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.glsl
index 7851f5f..b3d4e6f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_ebfb92() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_ebfb92() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
uvec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
uvec4 textureLoad_ebfb92() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_2 = (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u));
ivec2 v_3 = ivec2(min(uvec2(ivec2(1)), v_2));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.glsl
index 594ef0b..9d7e334 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_f348d9() {
uint v_2 = min(1u, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -36,23 +31,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_f348d9() {
uint v_2 = min(1u, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(1), v_3);
ivec2 v_5 = ivec2(min(uvec2(1u), (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u))));
ivec3 v_6 = ivec3(v_5, int(v_2));
@@ -69,24 +59,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
vec4 textureLoad_f348d9() {
uint v_1 = min(1u, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(1), v_2);
ivec2 v_4 = ivec2(min(uvec2(1u), (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u))));
ivec3 v_5 = ivec3(v_4, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.glsl
index da4493e..96c8e7a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.glsl
@@ -5,22 +5,17 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_f85291() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_2));
@@ -34,22 +29,17 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_f85291() {
- uint v_2 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(ivec2(1)), v_3));
ivec4 res = texelFetch(arg_0, v_4, int(v_2));
@@ -65,23 +55,19 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
ivec4 textureLoad_f85291() {
- uint v_1 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_1 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_2 = (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u));
ivec2 v_3 = ivec2(min(uvec2(ivec2(1)), v_2));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_1));
diff --git a/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.glsl
index 2ec4b62..846e741 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.glsl
@@ -5,24 +5,19 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_ff1119() {
uint v_2 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -37,24 +32,19 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_ff1119() {
uint v_2 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_3 = min(uint(1), v_2);
- uint v_4 = min(1u, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_4 = min(1u, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4)).xy) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(ivec2(1)), v_5));
ivec3 v_7 = ivec3(v_6, int(v_3));
@@ -71,25 +61,21 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
float textureLoad_ff1119() {
uint v_1 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_2 = min(uint(1), v_1);
- uint v_3 = min(1u, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(1u, (v.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3)).xy) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(ivec2(1)), v_4));
ivec3 v_6 = ivec3(v_5, int(v_2));
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.glsl
index 01b2743..a1884b1 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_181090() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_181090() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_181090() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.glsl
index b0895e2..61d79d4 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_1a3fa9() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_1a3fa9() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_1a3fa9() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl
index 2c5b664..ea55c31 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_1a7fc3() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_1a7fc3() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_1a7fc3() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.glsl
index abea402..ed734ae 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2267d8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2267d8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_2267d8() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.glsl
index fce6a89..7c37ada 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_24b2c6() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_24b2c6() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_24b2c6() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.glsl
index 89b245e..38bed31 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2bea6c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2bea6c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_2bea6c() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.glsl
index def426a..1228ae1 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2df1ab() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2df1ab() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_2df1ab() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.glsl
index 90a4eaf..cd5b86a 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_46dbd8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_46dbd8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_46dbd8() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.glsl
index 083e05e..8bea660 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_60d9b8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_60d9b8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_60d9b8() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.glsl
index a3cdbb7..ebf3b1a 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_903920() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_903920() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_903920() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.glsl
index 85eab13..de8161d 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_9a1a65() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_9a1a65() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_9a1a65() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.glsl
index 12cbaa2..b782151 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_adc783() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_adc783() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_adc783() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.glsl
index 224840b..44abc15 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_ae911c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_ae911c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_ae911c() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.glsl
index 4f7f38d..f0b2b7c 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c386c8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c386c8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_c386c8() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl
index d9bd55b..6d78afa 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c399f9() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c399f9() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_c399f9() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.glsl
index a409c36..1f921a5 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c8c25c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c8c25c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_c8c25c() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.glsl
index 5aa0318..8e86060 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_d63126() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_d63126() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_d63126() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.glsl
index 2d12ffd..27766d3 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_d8f73b() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_d8f73b() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_d8f73b() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.glsl
index 18b2155..cc41688 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_ef7944() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_ef7944() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_ef7944() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.glsl
index eacdb9f..981e1c6 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_efd6df() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_efd6df() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_efd6df() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl
index 5bf9dc7..a029109 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_f742c0() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_f742c0() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_f742c0() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.glsl
index 8082470..f531464 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_fe2171() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_fe2171() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_fe2171() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.glsl
index f30a26e..2ec84d3 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_50f399() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_50f399() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumSamples_50f399() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.glsl
index 1a5f4f8..d5d5708 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_c1a777() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_c1a777() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumSamples_c1a777() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.glsl
index 484f877..bae18b9 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_dbb799() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_dbb799() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumSamples_dbb799() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.glsl
index 016dd1d..d322047 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_ecd321() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_ecd321() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumSamples_ecd321() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl
index f747c79..80fe076 100644
--- a/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
uint textureDimensions_022903() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
uint textureDimensions_022903() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_022903() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u))))).x;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.glsl
index 7998055..35f7af4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
uvec3 textureDimensions_0890c6() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
uvec3 textureDimensions_0890c6() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_0890c6() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.glsl
index aabc8f2..458ca0b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray f_arg_0;
uvec2 textureDimensions_0ff9a4() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -33,23 +28,18 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray arg_0;
uvec2 textureDimensions_0ff9a4() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -63,24 +53,20 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_0ff9a4() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.glsl
index adf642a..15c73e4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uvec2 textureDimensions_13f8db() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uvec2 textureDimensions_13f8db() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_13f8db() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.glsl
index 088acbc..63274be 100644
--- a/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec2 textureDimensions_15b577() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec2 textureDimensions_15b577() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_15b577() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.glsl
index d47649c..508b9f3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
uvec3 textureDimensions_1bc428() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
uvec3 textureDimensions_1bc428() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_1bc428() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.glsl
index 7d066fc..7c7aca4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uvec2 textureDimensions_1bd78c() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uvec2 textureDimensions_1bd78c() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_1bd78c() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.glsl
index 025bc85..c517fe6 100644
--- a/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCubeArray f_arg_0;
uvec2 textureDimensions_22b5b6() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -33,23 +28,18 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCubeArray arg_0;
uvec2 textureDimensions_22b5b6() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -63,24 +53,20 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usamplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_22b5b6() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.glsl
index bf8855a..1f60b19 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
uvec2 textureDimensions_2e443d() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
uvec2 textureDimensions_2e443d() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_2e443d() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.glsl
index ca16184..aed4a22 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
uvec2 textureDimensions_2fd2a4() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
uvec2 textureDimensions_2fd2a4() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_2fd2a4() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.glsl
index 7b9de40..a40c9f4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCubeArray f_arg_0;
uvec2 textureDimensions_346fee() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCubeArray arg_0;
uvec2 textureDimensions_346fee() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usamplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_346fee() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.glsl
index 23540bd..ae3b431 100644
--- a/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube f_arg_0;
uvec2 textureDimensions_382b16() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube arg_0;
uvec2 textureDimensions_382b16() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_382b16() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.glsl
index 65ca1c4..0e857b5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCubeArray f_arg_0;
uvec2 textureDimensions_3963d0() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCubeArray arg_0;
uvec2 textureDimensions_3963d0() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isamplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_3963d0() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.glsl
index 48ad79c..b2bf19f 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCubeArray f_arg_0;
uvec2 textureDimensions_3c66f0() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -33,23 +28,18 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCubeArray arg_0;
uvec2 textureDimensions_3c66f0() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -63,24 +53,20 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isamplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_3c66f0() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.glsl
index db4314b..011ab40 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
uvec2 textureDimensions_3fc3dc() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
uvec2 textureDimensions_3fc3dc() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_3fc3dc() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.glsl
index 9152501..7561279 100644
--- a/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube f_arg_0;
uvec2 textureDimensions_49a067() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube arg_0;
uvec2 textureDimensions_49a067() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_49a067() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.glsl
index 16b56da..b8a3aa4 100644
--- a/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec2 textureDimensions_528c0e() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec2 textureDimensions_528c0e() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_528c0e() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.glsl
index 9dde058..1dc631c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCube f_arg_0;
uvec2 textureDimensions_64dc74() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCube arg_0;
uvec2 textureDimensions_64dc74() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isamplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_64dc74() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.glsl
index 3350dac..0e7cac6 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec3 textureDimensions_6e6c7a() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec3 textureDimensions_6e6c7a() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_6e6c7a() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.glsl
index 571c3ad..d326499 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uvec2 textureDimensions_6f1b5d() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uvec2 textureDimensions_6f1b5d() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_6f1b5d() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.glsl
index a0c98e9..606d893 100644
--- a/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
uvec3 textureDimensions_756031() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
uvec3 textureDimensions_756031() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_756031() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.glsl
index 38ed09b..63ba5cd 100644
--- a/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube f_arg_0;
uvec2 textureDimensions_79d168() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube arg_0;
uvec2 textureDimensions_79d168() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_79d168() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl
index d300610..052613e 100644
--- a/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uint textureDimensions_920006() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2)))).x;
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uint textureDimensions_920006() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2)))).x;
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_920006() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1)))).x;
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.glsl
index 8379e7e..30aa706 100644
--- a/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uvec2 textureDimensions_991ea9() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uvec2 textureDimensions_991ea9() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_991ea9() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.glsl
index 0b37f71..451f457 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCube f_arg_0;
uvec2 textureDimensions_9baf27() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCube arg_0;
uvec2 textureDimensions_9baf27() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usamplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_9baf27() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl
index 30c6274..00d7e0c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uint textureDimensions_9c7a00() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uint textureDimensions_9c7a00() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_9c7a00() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u))))).x;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.glsl
index cee3bfa..aab8eea 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCube f_arg_0;
uvec2 textureDimensions_9cd4ca() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usamplerCube arg_0;
uvec2 textureDimensions_9cd4ca() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usamplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_9cd4ca() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.glsl
index 78aeb0d..f5eb184 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec2 textureDimensions_9e0794() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec2 textureDimensions_9e0794() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_9e0794() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.glsl
index 27ecfbe..845b568 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCube f_arg_0;
uvec2 textureDimensions_a2ba5e() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isamplerCube arg_0;
uvec2 textureDimensions_a2ba5e() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isamplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_a2ba5e() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.glsl
index 0a9f09d..e8793cd 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
uvec2 textureDimensions_a48049() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
uvec2 textureDimensions_a48049() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_a48049() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl
index 57dc949..8a81095 100644
--- a/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uint textureDimensions_aac604() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uint textureDimensions_aac604() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u))))).x;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_aac604() {
uint arg_1 = 1u;
- uint res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u))))).x;
+ uint res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u))))).x;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.glsl
index 9035563..fe90ed3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray f_arg_0;
uvec2 textureDimensions_b3ab5e() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -33,23 +28,18 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray arg_0;
uvec2 textureDimensions_b3ab5e() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -63,24 +53,20 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_b3ab5e() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl
index 183b6b9..066af78 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
uint textureDimensions_b46d97() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2)))).x;
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
uint textureDimensions_b46d97() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2)))).x;
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_b46d97() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1)))).x;
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.glsl
index 0a5814a..dd5907c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray f_arg_0;
uvec2 textureDimensions_bd94c8() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray arg_0;
uvec2 textureDimensions_bd94c8() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_bd94c8() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.glsl
index 8a8c559..61f7005 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
uvec3 textureDimensions_c871f3() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
uvec3 textureDimensions_c871f3() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_c871f3() {
uint arg_1 = 1u;
- uvec3 res = uvec3(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec3 res = uvec3(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.glsl
index b8bb85d..6620618 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray f_arg_0;
uvec2 textureDimensions_cf2b50() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCubeArray arg_0;
uvec2 textureDimensions_cf2b50() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_cf2b50() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.glsl
index fcfe69a..30fb146 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube f_arg_0;
uvec2 textureDimensions_d3accd() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp samplerCube arg_0;
uvec2 textureDimensions_d3accd() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_d3accd() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.glsl
index 8f1bf84..0afa6ee 100644
--- a/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
uvec2 textureDimensions_dfdc32() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
uvec2 textureDimensions_dfdc32() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_dfdc32() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.glsl
index 865bddb..2b717f8 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec2 textureDimensions_e18a8b() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec2 textureDimensions_e18a8b() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))));
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_e18a8b() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))));
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))));
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.glsl
index 0187c2e..4909940 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
uvec2 textureDimensions_e4e310() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
uvec2 textureDimensions_e4e310() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_e4e310() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.glsl
index 68d3099..0cfecc3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec3 textureDimensions_e5a203() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(f_arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec3 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec3 textureDimensions_e5a203() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(arg_0, int(min(uint(arg_1), v_2))));
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec3 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec3 tint_interstage_location0;
uvec3 textureDimensions_e5a203() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec3 res = uvec3(textureSize(v_arg_0, int(min(uint(arg_1), v_1))));
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.glsl
index 332bab3..17e98d9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
uvec2 textureDimensions_eafe19() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(f_arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
void main() {
@@ -32,23 +27,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
uvec2 textureDimensions_eafe19() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(arg_0, int(min(arg_1, (v_1.tint_builtin_value_0 - 1u)))).xy);
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -61,24 +51,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_eafe19() {
uint arg_1 = 1u;
- uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.inner.tint_builtin_value_0 - 1u)))).xy);
+ uvec2 res = uvec2(textureSize(v_arg_0, int(min(arg_1, (v.tint_builtin_value_0 - 1u)))).xy);
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl
index ea952b1..82f50ed 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
uint textureDimensions_f17acd() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2)))).x;
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
uint textureDimensions_f17acd() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2)))).x;
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureDimensions_f17acd() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1)))).x;
return res;
}
diff --git a/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.glsl
index 516e9a7..adf58e1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.glsl
@@ -5,23 +5,18 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
uvec2 textureDimensions_fdf6e9() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(f_arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -33,23 +28,18 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec2 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
uvec2 textureDimensions_fdf6e9() {
int arg_1 = 1;
- uint v_2 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v_1.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(arg_0, int(min(uint(arg_1), v_2))).xy);
return res;
}
@@ -63,24 +53,20 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec2 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out uvec2 tint_interstage_location0;
uvec2 textureDimensions_fdf6e9() {
int arg_1 = 1;
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 res = uvec2(textureSize(v_arg_0, int(min(uint(arg_1), v_1))).xy);
return res;
}
diff --git a/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.glsl
index d833b29..e370472 100644
--- a/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
vec4 textureLoad_019da0() {
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_4 = (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_2), v_4));
vec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
vec4 textureLoad_019da0() {
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_4 = (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_2), v_4));
vec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(v_1), v_3));
vec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.glsl
index a8930f5..61c1108 100644
--- a/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_026217() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_026217() {
@@ -64,7 +54,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -104,7 +90,7 @@
uint v_2 = arg_2;
int v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v.tint_builtin_value_0 - 1u);
uint v_6 = min(uint(v_3), v_5);
ivec2 v_7 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.glsl
index be8b95f..034fc05 100644
--- a/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_04b911() {
@@ -28,7 +23,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_6));
float res = texelFetch(f_arg_0, v_9, int(v_7)).x;
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_04b911() {
@@ -65,7 +55,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_6));
float res = texelFetch(arg_0, v_9, int(v_7)).x;
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -105,7 +91,7 @@
uint v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_3, (v.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
float res = texelFetch(v_arg_0, v_8, int(v_6)).x;
diff --git a/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl
index 3401589..88d32a8 100644
--- a/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_0cb698() {
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(uvec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u)), 0u));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_0cb698() {
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(uvec2(min(v_2, (uvec2(textureSize(arg_0, int(v_3))).x - 1u)), 0u));
ivec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u)), 0u));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl
index d0d42b1..d403873 100644
--- a/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_1373dc() {
uint arg_1 = 1u;
int arg_2 = 1;
uint v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(uvec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_4))).x - 1u)), 0u));
vec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_1373dc() {
uint arg_1 = 1u;
int arg_2 = 1;
uint v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(uvec2(min(v_2, (uvec2(textureSize(arg_0, int(v_4))).x - 1u)), 0u));
vec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uint arg_1 = 1u;
int arg_2 = 1;
uint v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec2 v_4 = ivec2(uvec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_3))).x - 1u)), 0u));
vec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.glsl
index b2915bd..a7aa873 100644
--- a/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_168dc8() {
@@ -28,7 +23,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
ivec2 v_9 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_8)).xy) - uvec2(1u))));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_168dc8() {
@@ -66,7 +56,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
ivec2 v_9 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_8)).xy) - uvec2(1u))));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -107,7 +93,7 @@
int v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_3), v_6);
ivec2 v_8 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.glsl
index e4bfdf5..4f8829b 100644
--- a/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
float textureLoad_19cf87() {
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4))) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(v_2), v_5));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
float textureLoad_19cf87() {
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4))) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(v_2), v_5));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -92,7 +78,7 @@
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_1), v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.glsl
index beff540..2097c71 100644
--- a/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_1b051f() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(f_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_2), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_1b051f() {
@@ -64,7 +54,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_2), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -104,7 +90,7 @@
uint v_2 = arg_2;
uint v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_5 = min(v_3, (v.tint_builtin_value_0 - 1u));
uvec2 v_6 = (uvec2(textureSize(v_arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(v_1), v_6));
ivec3 v_8 = ivec3(v_7, int(v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl
index 2d7eb17..a6abd8b 100644
--- a/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_1b8588() {
int arg_1 = 1;
int arg_2 = 1;
int v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uint v_5 = (uvec2(textureSize(f_arg_0, int(v_4))).x - 1u);
ivec2 v_6 = ivec2(uvec2(min(uint(v_2), v_5), 0u));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_1b8588() {
int arg_1 = 1;
int arg_2 = 1;
int v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uint v_5 = (uvec2(textureSize(arg_0, int(v_4))).x - 1u);
ivec2 v_6 = ivec2(uvec2(min(uint(v_2), v_5), 0u));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
int arg_1 = 1;
int arg_2 = 1;
int v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uint v_4 = (uvec2(textureSize(v_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_1), v_4), 0u));
diff --git a/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.glsl
index 8ad1b20..fc48304 100644
--- a/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec4 textureLoad_1c562a() {
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_4 = ivec3(min(v_2, (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u))));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec4 textureLoad_1c562a() {
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_4 = ivec3(min(v_2, (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u))));
uvec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(v_1, (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u))));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.glsl
index 7d9928e..25549b4 100644
--- a/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
vec4 textureLoad_1f2016() {
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec3 v_5 = (uvec3(textureSize(f_arg_0, int(v_4))) - uvec3(1u));
ivec3 v_6 = ivec3(min(uvec3(v_2), v_5));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
vec4 textureLoad_1f2016() {
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec3 v_5 = (uvec3(textureSize(arg_0, int(v_4))) - uvec3(1u));
ivec3 v_6 = ivec3(min(uvec3(v_2), v_5));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uvec3 v_4 = (uvec3(textureSize(v_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_1), v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl
index 0d0411e..b98e47d 100644
--- a/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_216c37() {
uint arg_1 = 1u;
int arg_2 = 1;
uint v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(uvec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_4))).x - 1u)), 0u));
uvec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_216c37() {
uint arg_1 = 1u;
int arg_2 = 1;
uint v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(uvec2(min(v_2, (uvec2(textureSize(arg_0, int(v_4))).x - 1u)), 0u));
uvec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uint arg_1 = 1u;
int arg_2 = 1;
uint v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec2 v_4 = ivec2(uvec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_3))).x - 1u)), 0u));
uvec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.glsl
index aaab0fa..3e3080c 100644
--- a/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
vec4 textureLoad_21d1c4() {
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_4 = ivec3(min(v_2, (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u))));
vec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
vec4 textureLoad_21d1c4() {
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_4 = ivec3(min(v_2, (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u))));
vec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(v_1, (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u))));
vec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.glsl
index eebd08b..f8b6d08 100644
--- a/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
ivec4 textureLoad_223246() {
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec3 v_5 = ivec3(min(v_2, (uvec3(textureSize(f_arg_0, int(v_4))) - uvec3(1u))));
ivec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
ivec4 textureLoad_223246() {
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec3 v_5 = ivec3(min(v_2, (uvec3(textureSize(arg_0, int(v_4))) - uvec3(1u))));
ivec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec3 v_4 = ivec3(min(v_1, (uvec3(textureSize(v_arg_0, int(v_3))) - uvec3(1u))));
ivec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.glsl
index 4c9b5dc..ca35a10 100644
--- a/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_2363be() {
@@ -28,7 +23,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_6));
ivec4 res = texelFetch(f_arg_0, v_9, int(v_7));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_2363be() {
@@ -65,7 +55,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_6));
ivec4 res = texelFetch(arg_0, v_9, int(v_7));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -105,7 +91,7 @@
uint v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_3, (v.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
ivec4 res = texelFetch(v_arg_0, v_8, int(v_6));
diff --git a/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.glsl
index dc6dc4f..dc97adc 100644
--- a/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_2d479c() {
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_2), v_4));
vec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_2d479c() {
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_2), v_4));
vec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(v_1), v_3));
vec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.glsl
index 9e58f08..19275aa 100644
--- a/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_3c96e8() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(f_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_2), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_3c96e8() {
@@ -64,7 +54,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_2), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -104,7 +90,7 @@
uint v_2 = arg_2;
uint v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_5 = min(v_3, (v.tint_builtin_value_0 - 1u));
uvec2 v_6 = (uvec2(textureSize(v_arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(v_1), v_6));
ivec3 v_8 = ivec3(v_7, int(v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.glsl
index 4ced54c..56de715 100644
--- a/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_3d3fd1() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_3d3fd1() {
@@ -64,7 +54,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -104,7 +90,7 @@
uint v_2 = arg_2;
int v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v.tint_builtin_value_0 - 1u);
uint v_6 = min(uint(v_3), v_5);
ivec2 v_7 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl
index 43979cf..de8bfa5 100644
--- a/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_3da3ed() {
int arg_1 = 1;
uint arg_2 = 1u;
int v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uint v_4 = (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_2), v_4), 0u));
vec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_3da3ed() {
int arg_1 = 1;
uint arg_2 = 1u;
int v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uint v_4 = (uvec2(textureSize(arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_2), v_4), 0u));
vec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
int arg_1 = 1;
uint arg_2 = 1u;
int v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(v_1), v_3), 0u));
vec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.glsl
index 8044294..2e684c2 100644
--- a/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_439e2a() {
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_4))) - uvec2(1u))));
vec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_439e2a() {
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_4))) - uvec2(1u))));
vec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec2 v_4 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_3))) - uvec2(1u))));
vec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.glsl
index 19a41bb..1f523b7 100644
--- a/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_46a93f() {
@@ -28,7 +23,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_6));
vec4 res = texelFetch(f_arg_0, v_9, int(v_7));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_46a93f() {
@@ -65,7 +55,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_6));
vec4 res = texelFetch(arg_0, v_9, int(v_7));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -105,7 +91,7 @@
uint v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_3, (v.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
vec4 res = texelFetch(v_arg_0, v_8, int(v_6));
diff --git a/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.glsl
index 92867bb..0d18f47 100644
--- a/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
ivec4 textureLoad_47e818() {
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_4 = ivec3(min(v_2, (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u))));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
ivec4 textureLoad_47e818() {
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec3 v_4 = ivec3(min(v_2, (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u))));
ivec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uvec3 arg_1 = uvec3(1u);
uint arg_2 = 1u;
uvec3 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec3 v_3 = ivec3(min(v_1, (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u))));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.glsl
index 158b810..016cc70 100644
--- a/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_484344() {
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4))) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(v_2), v_5));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_484344() {
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4))) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(v_2), v_5));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_1), v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.glsl
index 28070aa..f3b770f 100644
--- a/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_4acb64() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
uvec2 v_8 = (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_4acb64() {
@@ -65,7 +55,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
uvec2 v_8 = (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -106,7 +92,7 @@
uint v_2 = arg_2;
int v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v.tint_builtin_value_0 - 1u);
uint v_6 = min(uint(v_3), v_5);
uvec2 v_7 = (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_1), v_7));
diff --git a/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl
index e4b9827..f99d52e 100644
--- a/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_4c423f() {
uint arg_1 = 1u;
int arg_2 = 1;
uint v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(uvec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_4))).x - 1u)), 0u));
ivec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_4c423f() {
uint arg_1 = 1u;
int arg_2 = 1;
uint v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(uvec2(min(v_2, (uvec2(textureSize(arg_0, int(v_4))).x - 1u)), 0u));
ivec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uint arg_1 = 1u;
int arg_2 = 1;
uint v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec2 v_4 = ivec2(uvec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_3))).x - 1u)), 0u));
ivec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.glsl
index d1caeab..bf91727 100644
--- a/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
ivec4 textureLoad_4fd803() {
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec3 v_5 = (uvec3(textureSize(f_arg_0, int(v_4))) - uvec3(1u));
ivec3 v_6 = ivec3(min(uvec3(v_2), v_5));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
ivec4 textureLoad_4fd803() {
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec3 v_5 = (uvec3(textureSize(arg_0, int(v_4))) - uvec3(1u));
ivec3 v_6 = ivec3(min(uvec3(v_2), v_5));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uvec3 v_4 = (uvec3(textureSize(v_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_1), v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.glsl
index 387c72e..852bd26 100644
--- a/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_53e142() {
@@ -28,7 +23,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
ivec2 v_9 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_8)).xy) - uvec2(1u))));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_53e142() {
@@ -66,7 +56,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
ivec2 v_9 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_8)).xy) - uvec2(1u))));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -107,7 +93,7 @@
int v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_3), v_6);
ivec2 v_8 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.glsl
index fe27cb2..b8c92b8 100644
--- a/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_54a59b() {
@@ -28,7 +23,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
ivec2 v_9 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_8)).xy) - uvec2(1u))));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_54a59b() {
@@ -66,7 +56,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
ivec2 v_9 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_8)).xy) - uvec2(1u))));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -107,7 +93,7 @@
int v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_3), v_6);
ivec2 v_8 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl
index 3388b06..0ae73bd 100644
--- a/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_5a2f9d() {
int arg_1 = 1;
int arg_2 = 1;
int v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uint v_5 = (uvec2(textureSize(f_arg_0, int(v_4))).x - 1u);
ivec2 v_6 = ivec2(uvec2(min(uint(v_2), v_5), 0u));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_5a2f9d() {
int arg_1 = 1;
int arg_2 = 1;
int v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uint v_5 = (uvec2(textureSize(arg_0, int(v_4))).x - 1u);
ivec2 v_6 = ivec2(uvec2(min(uint(v_2), v_5), 0u));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
int arg_1 = 1;
int arg_2 = 1;
int v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uint v_4 = (uvec2(textureSize(v_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_1), v_4), 0u));
diff --git a/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.glsl
index 9af7ad9..8ec98ca1 100644
--- a/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_6154d4() {
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4))) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(v_2), v_5));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_6154d4() {
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4))) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(v_2), v_5));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_1), v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl
index f6daec2..61f4c2c 100644
--- a/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_62d1de() {
int arg_1 = 1;
uint arg_2 = 1u;
int v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uint v_4 = (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_2), v_4), 0u));
ivec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_62d1de() {
int arg_1 = 1;
uint arg_2 = 1u;
int v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uint v_4 = (uvec2(textureSize(arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_2), v_4), 0u));
ivec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
int arg_1 = 1;
uint arg_2 = 1u;
int v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(v_1), v_3), 0u));
ivec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.glsl
index f352fa2..91b68f6 100644
--- a/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_656d76() {
@@ -28,7 +23,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_8 = (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_656d76() {
@@ -66,7 +56,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_8 = (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -107,7 +93,7 @@
uint v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_3, (v.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_1), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.glsl
index 5168fa9..d795f44 100644
--- a/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_66be47() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(f_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_2), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_66be47() {
@@ -64,7 +54,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_2), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -104,7 +90,7 @@
uint v_2 = arg_2;
uint v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_5 = min(v_3, (v.tint_builtin_value_0 - 1u));
uvec2 v_6 = (uvec2(textureSize(v_arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(v_1), v_6));
ivec3 v_8 = ivec3(v_7, int(v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl
index afa7819..d85f077 100644
--- a/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_6b77d4() {
int arg_1 = 1;
uint arg_2 = 1u;
int v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uint v_4 = (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_2), v_4), 0u));
uvec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_6b77d4() {
int arg_1 = 1;
uint arg_2 = 1u;
int v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uint v_4 = (uvec2(textureSize(arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_2), v_4), 0u));
uvec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
int arg_1 = 1;
uint arg_2 = 1u;
int v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uint v_3 = (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u);
ivec2 v_4 = ivec2(uvec2(min(uint(v_1), v_3), 0u));
uvec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.glsl
index 7adf238..1ca4459 100644
--- a/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec4 textureLoad_6bf4b7() {
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_4 = (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_2), v_4));
uvec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec4 textureLoad_6bf4b7() {
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_4 = (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_2), v_4));
uvec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(v_1), v_3));
uvec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl
index a5124dc..b6dfe38 100644
--- a/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_6d376a() {
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(uvec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u)), 0u));
vec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_6d376a() {
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(uvec2(min(v_2, (uvec2(textureSize(arg_0, int(v_3))).x - 1u)), 0u));
vec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u)), 0u));
vec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.glsl
index f84312b..0b2a8b3 100644
--- a/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_714471() {
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u))));
ivec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_714471() {
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u))));
ivec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u))));
ivec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.glsl
index c16703b..a598934 100644
--- a/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_789045() {
@@ -28,7 +23,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_8 = (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_789045() {
@@ -66,7 +56,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_8 = (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -107,7 +93,7 @@
uint v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_3, (v.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_1), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.glsl
index 57412fa..5b1d62e 100644
--- a/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_79e697() {
@@ -28,7 +23,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
uvec2 v_9 = (uvec2(textureSize(f_arg_0, int(v_8)).xy) - uvec2(1u));
ivec2 v_10 = ivec2(min(uvec2(v_2), v_9));
@@ -44,18 +39,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_79e697() {
@@ -67,7 +57,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
uvec2 v_9 = (uvec2(textureSize(arg_0, int(v_8)).xy) - uvec2(1u));
ivec2 v_10 = ivec2(min(uvec2(v_2), v_9));
@@ -85,18 +75,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -109,7 +95,7 @@
int v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_3), v_6);
uvec2 v_8 = (uvec2(textureSize(v_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_1), v_8));
diff --git a/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.glsl
index 7f540d3..09b7d0e 100644
--- a/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_7ab4df() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
uvec2 v_8 = (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_7ab4df() {
@@ -65,7 +55,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
uvec2 v_8 = (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -106,7 +92,7 @@
uint v_2 = arg_2;
int v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v.tint_builtin_value_0 - 1u);
uint v_6 = min(uint(v_3), v_5);
uvec2 v_7 = (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_1), v_7));
diff --git a/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.glsl
index f61376b..4d5949e 100644
--- a/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_7b63e0() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
float res = texelFetch(f_arg_0, v_8, int(v_6)).x;
@@ -41,18 +36,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_7b63e0() {
@@ -63,7 +53,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
float res = texelFetch(arg_0, v_8, int(v_6)).x;
@@ -79,18 +69,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -102,7 +88,7 @@
uint v_2 = arg_2;
uint v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_5 = min(v_3, (v.tint_builtin_value_0 - 1u));
ivec2 v_6 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_4));
float res = texelFetch(v_arg_0, v_7, int(v_5)).x;
diff --git a/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.glsl
index 57e07fa..31e137c 100644
--- a/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_7c90e5() {
@@ -28,7 +23,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
uvec2 v_9 = (uvec2(textureSize(f_arg_0, int(v_8)).xy) - uvec2(1u));
ivec2 v_10 = ivec2(min(uvec2(v_2), v_9));
@@ -44,18 +39,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_7c90e5() {
@@ -67,7 +57,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
uvec2 v_9 = (uvec2(textureSize(arg_0, int(v_8)).xy) - uvec2(1u));
ivec2 v_10 = ivec2(min(uvec2(v_2), v_9));
@@ -85,18 +75,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -109,7 +95,7 @@
int v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_3), v_6);
uvec2 v_8 = (uvec2(textureSize(v_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_1), v_8));
diff --git a/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.glsl
index 44bac4b..eec5124 100644
--- a/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
float textureLoad_7fd822() {
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_4))) - uvec2(1u))));
float res = texelFetch(f_arg_0, v_5, int(v_4)).x;
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
float textureLoad_7fd822() {
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_4))) - uvec2(1u))));
float res = texelFetch(arg_0, v_5, int(v_4)).x;
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -90,7 +76,7 @@
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec2 v_4 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_3))) - uvec2(1u))));
float res = texelFetch(v_arg_0, v_4, int(v_3)).x;
diff --git a/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl
index d4b1cbc..840d1c1 100644
--- a/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_81c381() {
int arg_1 = 1;
int arg_2 = 1;
int v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uint v_5 = (uvec2(textureSize(f_arg_0, int(v_4))).x - 1u);
ivec2 v_6 = ivec2(uvec2(min(uint(v_2), v_5), 0u));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_81c381() {
int arg_1 = 1;
int arg_2 = 1;
int v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uint v_5 = (uvec2(textureSize(arg_0, int(v_4))).x - 1u);
ivec2 v_6 = ivec2(uvec2(min(uint(v_2), v_5), 0u));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
int arg_1 = 1;
int arg_2 = 1;
int v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uint v_4 = (uvec2(textureSize(v_arg_0, int(v_3))).x - 1u);
ivec2 v_5 = ivec2(uvec2(min(uint(v_1), v_4), 0u));
diff --git a/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.glsl
index 996ad68..c61bee2 100644
--- a/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
vec4 textureLoad_84dee1() {
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u))));
vec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
vec4 textureLoad_84dee1() {
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u))));
vec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u))));
vec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.glsl
index 57c0dd2..e73caf8 100644
--- a/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_8527b1() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
uvec4 res = texelFetch(f_arg_0, v_8, int(v_6));
@@ -41,18 +36,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_8527b1() {
@@ -63,7 +53,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
uvec4 res = texelFetch(arg_0, v_8, int(v_6));
@@ -79,18 +69,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -102,7 +88,7 @@
uint v_2 = arg_2;
uint v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_5 = min(v_3, (v.tint_builtin_value_0 - 1u));
ivec2 v_6 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_4));
uvec4 res = texelFetch(v_arg_0, v_7, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.glsl
index 2f6aee2..06e1e59 100644
--- a/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_87be85() {
@@ -28,7 +23,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
uvec2 v_9 = (uvec2(textureSize(f_arg_0, int(v_8)).xy) - uvec2(1u));
ivec2 v_10 = ivec2(min(uvec2(v_2), v_9));
@@ -44,18 +39,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_87be85() {
@@ -67,7 +57,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
uvec2 v_9 = (uvec2(textureSize(arg_0, int(v_8)).xy) - uvec2(1u));
ivec2 v_10 = ivec2(min(uvec2(v_2), v_9));
@@ -85,18 +75,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -109,7 +95,7 @@
int v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_3), v_6);
uvec2 v_8 = (uvec2(textureSize(v_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_1), v_8));
diff --git a/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.glsl
index 048e651..2705e49 100644
--- a/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_897cf3() {
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u))));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_897cf3() {
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u))));
uvec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u))));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.glsl
index bb99a60..236d26c 100644
--- a/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
float textureLoad_8ccbe3() {
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_2), v_4));
float res = texelFetch(f_arg_0, v_5, int(v_3)).x;
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
float textureLoad_8ccbe3() {
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_2), v_4));
float res = texelFetch(arg_0, v_5, int(v_3)).x;
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -90,7 +76,7 @@
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(v_1), v_3));
float res = texelFetch(v_arg_0, v_4, int(v_2)).x;
diff --git a/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.glsl
index 2326cca..0e118311 100644
--- a/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec4 textureLoad_92eb1f() {
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec3 v_5 = ivec3(min(v_2, (uvec3(textureSize(f_arg_0, int(v_4))) - uvec3(1u))));
uvec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec4 textureLoad_92eb1f() {
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec3 v_5 = ivec3(min(v_2, (uvec3(textureSize(arg_0, int(v_4))) - uvec3(1u))));
uvec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec3 v_4 = ivec3(min(v_1, (uvec3(textureSize(v_arg_0, int(v_3))) - uvec3(1u))));
uvec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.glsl
index 32e3e71..da0f71d 100644
--- a/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_96efd5() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
vec4 res = texelFetch(f_arg_0, v_8, int(v_6));
@@ -41,18 +36,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_96efd5() {
@@ -63,7 +53,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
vec4 res = texelFetch(arg_0, v_8, int(v_6));
@@ -79,18 +69,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -102,7 +88,7 @@
uint v_2 = arg_2;
uint v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_5 = min(v_3, (v.tint_builtin_value_0 - 1u));
ivec2 v_6 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_4));
vec4 res = texelFetch(v_arg_0, v_7, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.glsl
index 5b23acc..a33c37b 100644
--- a/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_9885b0() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
ivec4 res = texelFetch(f_arg_0, v_8, int(v_6));
@@ -41,18 +36,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_9885b0() {
@@ -63,7 +53,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
ivec4 res = texelFetch(arg_0, v_8, int(v_6));
@@ -79,18 +69,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -102,7 +88,7 @@
uint v_2 = arg_2;
uint v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_5 = min(v_3, (v.tint_builtin_value_0 - 1u));
ivec2 v_6 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_5)).xy) - uvec2(1u))));
ivec3 v_7 = ivec3(v_6, int(v_4));
ivec4 res = texelFetch(v_arg_0, v_7, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.glsl
index f7d3149..55c510c 100644
--- a/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_9aa733() {
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_4))) - uvec2(1u))));
ivec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_9aa733() {
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_4))) - uvec2(1u))));
ivec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec2 v_4 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_3))) - uvec2(1u))));
ivec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.glsl
index ed56f87..8ce41c2 100644
--- a/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_9b2667() {
@@ -28,7 +23,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
uvec2 v_9 = (uvec2(textureSize(f_arg_0, int(v_8)).xy) - uvec2(1u));
ivec2 v_10 = ivec2(min(uvec2(v_2), v_9));
@@ -44,18 +39,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_9b2667() {
@@ -67,7 +57,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
uvec2 v_9 = (uvec2(textureSize(arg_0, int(v_8)).xy) - uvec2(1u));
ivec2 v_10 = ivec2(min(uvec2(v_2), v_9));
@@ -85,18 +75,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -109,7 +95,7 @@
int v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_3), v_6);
uvec2 v_8 = (uvec2(textureSize(v_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_1), v_8));
diff --git a/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.glsl
index ce7e422..916c131 100644
--- a/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_9d70e9() {
@@ -28,7 +23,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_8 = (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_9d70e9() {
@@ -66,7 +56,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_8 = (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -107,7 +93,7 @@
uint v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_3, (v.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_1), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.glsl
index d167de7..af74aa0 100644
--- a/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D f_arg_0;
float textureLoad_9ed19e() {
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u))));
float res = texelFetch(f_arg_0, v_4, int(v_3)).x;
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2D arg_0;
float textureLoad_9ed19e() {
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u))));
float res = texelFetch(arg_0, v_4, int(v_3)).x;
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -88,7 +74,7 @@
uvec2 arg_1 = uvec2(1u);
uint arg_2 = 1u;
uvec2 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u))));
float res = texelFetch(v_arg_0, v_3, int(v_2)).x;
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.glsl
index 36719ed..f268d75 100644
--- a/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_9fbfd9() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(f_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_2), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_9fbfd9() {
@@ -64,7 +54,7 @@
uint v_3 = arg_2;
uint v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_2), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -104,7 +90,7 @@
uint v_2 = arg_2;
uint v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_5 = min(v_3, (v.tint_builtin_value_0 - 1u));
uvec2 v_6 = (uvec2(textureSize(v_arg_0, int(v_5)).xy) - uvec2(1u));
ivec2 v_7 = ivec2(min(uvec2(v_1), v_6));
ivec3 v_8 = ivec3(v_7, int(v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.glsl
index b31b3c0..af26b9e 100644
--- a/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray f_arg_0;
uvec4 textureLoad_a24be1() {
@@ -28,7 +23,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_6));
uvec4 res = texelFetch(f_arg_0, v_9, int(v_7));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2DArray arg_0;
uvec4 textureLoad_a24be1() {
@@ -65,7 +55,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_6));
uvec4 res = texelFetch(arg_0, v_9, int(v_7));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2DArray v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -105,7 +91,7 @@
uint v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_3, (v.tint_builtin_value_0 - 1u));
ivec2 v_7 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_5));
uvec4 res = texelFetch(v_arg_0, v_8, int(v_6));
diff --git a/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.glsl
index 88869ea..46edae6 100644
--- a/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D f_arg_0;
uvec4 textureLoad_a9a9f5() {
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec3 v_5 = (uvec3(textureSize(f_arg_0, int(v_4))) - uvec3(1u));
ivec3 v_6 = ivec3(min(uvec3(v_2), v_5));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler3D arg_0;
uvec4 textureLoad_a9a9f5() {
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec3 v_5 = (uvec3(textureSize(arg_0, int(v_4))) - uvec3(1u));
ivec3 v_6 = ivec3(min(uvec3(v_2), v_5));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler3D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
ivec3 arg_1 = ivec3(1);
int arg_2 = 1;
ivec3 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uvec3 v_4 = (uvec3(textureSize(v_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_1), v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.glsl
index 962f684..4bb61cd 100644
--- a/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray f_arg_0;
ivec4 textureLoad_b29f71() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
uvec2 v_8 = (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2DArray arg_0;
ivec4 textureLoad_b29f71() {
@@ -65,7 +55,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
uvec2 v_8 = (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2DArray v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -106,7 +92,7 @@
uint v_2 = arg_2;
int v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v.tint_builtin_value_0 - 1u);
uint v_6 = min(uint(v_3), v_5);
uvec2 v_7 = (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_1), v_7));
diff --git a/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.glsl
index 38adb62..262df2e 100644
--- a/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_b6ba5d() {
@@ -28,7 +23,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
ivec2 v_9 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_8)).xy) - uvec2(1u))));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_b6ba5d() {
@@ -66,7 +56,7 @@
int v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_7 = (v_1.tint_builtin_value_0 - 1u);
uint v_8 = min(uint(v_4), v_7);
ivec2 v_9 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_8)).xy) - uvec2(1u))));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -107,7 +93,7 @@
int v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_3), v_6);
ivec2 v_8 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.glsl
index e2537a9..7a00e9f 100644
--- a/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_b73f6b() {
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_4))) - uvec2(1u))));
uvec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_b73f6b() {
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_4))) - uvec2(1u))));
uvec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uvec2 arg_1 = uvec2(1u);
int arg_2 = 1;
uvec2 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec2 v_4 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_3))) - uvec2(1u))));
uvec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl
index fce564b..cd08290 100644
--- a/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_bc3201() {
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(uvec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_3))).x - 1u)), 0u));
uvec4 res = texelFetch(f_arg_0, v_4, int(v_3));
return res;
@@ -36,25 +31,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_bc3201() {
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
ivec2 v_4 = ivec2(uvec2(min(v_2, (uvec2(textureSize(arg_0, int(v_3))).x - 1u)), 0u));
uvec4 res = texelFetch(arg_0, v_4, int(v_3));
return res;
@@ -69,18 +59,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -88,7 +74,7 @@
uint arg_1 = 1u;
uint arg_2 = 1u;
uint v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
ivec2 v_3 = ivec2(uvec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_2))).x - 1u)), 0u));
uvec4 res = texelFetch(v_arg_0, v_3, int(v_2));
return res;
diff --git a/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.glsl
index 3b045b5..4306ca9 100644
--- a/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D f_arg_0;
vec4 textureLoad_bcbb3c() {
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec3 v_5 = ivec3(min(v_2, (uvec3(textureSize(f_arg_0, int(v_4))) - uvec3(1u))));
vec4 res = texelFetch(f_arg_0, v_5, int(v_4));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler3D arg_0;
vec4 textureLoad_bcbb3c() {
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
ivec3 v_5 = ivec3(min(v_2, (uvec3(textureSize(arg_0, int(v_4))) - uvec3(1u))));
vec4 res = texelFetch(arg_0, v_5, int(v_4));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler3D v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
uvec3 arg_1 = uvec3(1u);
int arg_2 = 1;
uvec3 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
ivec3 v_4 = ivec3(min(v_1, (uvec3(textureSize(v_arg_0, int(v_3))) - uvec3(1u))));
vec4 res = texelFetch(v_arg_0, v_4, int(v_3));
diff --git a/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.glsl
index 154a4d2..af233f1 100644
--- a/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_c16e00() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
uvec2 v_8 = (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_c16e00() {
@@ -65,7 +55,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
uvec2 v_8 = (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -106,7 +92,7 @@
uint v_2 = arg_2;
int v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v.tint_builtin_value_0 - 1u);
uint v_6 = min(uint(v_3), v_5);
uvec2 v_7 = (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_1), v_7));
diff --git a/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.glsl
index 99f221d..acf49e9 100644
--- a/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_c2a480() {
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec2 v_5 = (uvec2(textureSize(f_arg_0, int(v_4))) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(v_2), v_5));
@@ -38,25 +33,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_c2a480() {
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_2 = arg_1;
- uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_3 = (v_1.tint_builtin_value_0 - 1u);
uint v_4 = min(uint(arg_2), v_3);
uvec2 v_5 = (uvec2(textureSize(arg_0, int(v_4))) - uvec2(1u));
ivec2 v_6 = ivec2(min(uvec2(v_2), v_5));
@@ -73,18 +63,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -92,7 +78,7 @@
ivec2 arg_1 = ivec2(1);
int arg_2 = 1;
ivec2 v_1 = arg_1;
- uint v_2 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_2 = (v.tint_builtin_value_0 - 1u);
uint v_3 = min(uint(arg_2), v_2);
uvec2 v_4 = (uvec2(textureSize(v_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_1), v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.glsl
index 705446c..1933cf5 100644
--- a/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_cb57c2() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_cb57c2() {
@@ -64,7 +54,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -104,7 +90,7 @@
uint v_2 = arg_2;
int v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v.tint_builtin_value_0 - 1u);
uint v_6 = min(uint(v_3), v_5);
ivec2 v_7 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.glsl
index f04740b..840b365 100644
--- a/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D f_arg_0;
ivec4 textureLoad_e35f72() {
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_4 = (uvec3(textureSize(f_arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_2), v_4));
ivec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler3D arg_0;
ivec4 textureLoad_e35f72() {
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec3 v_4 = (uvec3(textureSize(arg_0, int(v_3))) - uvec3(1u));
ivec3 v_5 = ivec3(min(uvec3(v_2), v_4));
ivec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler3D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
ivec3 arg_1 = ivec3(1);
uint arg_2 = 1u;
ivec3 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uvec3 v_3 = (uvec3(textureSize(v_arg_0, int(v_2))) - uvec3(1u));
ivec3 v_4 = ivec3(min(uvec3(v_1), v_3));
ivec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.glsl
index 32e6f98..1090a6c 100644
--- a/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D f_arg_0;
uvec4 textureLoad_ebfb92() {
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_2), v_4));
uvec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uvec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp usampler2D arg_0;
uvec4 textureLoad_ebfb92() {
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_2), v_4));
uvec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uvec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp usampler2D v_arg_0;
layout(location = 0) flat out uvec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(v_1), v_3));
uvec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.glsl
index 32f6bb3..0f837b3 100644
--- a/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
vec4 textureLoad_f348d9() {
@@ -27,7 +22,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(f_arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -42,18 +37,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
vec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
vec4 textureLoad_f348d9() {
@@ -64,7 +54,7 @@
uint v_3 = arg_2;
int v_4 = arg_3;
uint v_5 = min(v_3, (uint(textureSize(arg_0, 0).z) - 1u));
- uint v_6 = (v_1.inner.tint_builtin_value_0 - 1u);
+ uint v_6 = (v_1.tint_builtin_value_0 - 1u);
uint v_7 = min(uint(v_4), v_6);
ivec2 v_8 = ivec2(min(v_2, (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u))));
ivec3 v_9 = ivec3(v_8, int(v_5));
@@ -81,18 +71,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
vec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out vec4 tint_interstage_location0;
@@ -104,7 +90,7 @@
uint v_2 = arg_2;
int v_3 = arg_3;
uint v_4 = min(v_2, (uint(textureSize(v_arg_0, 0).z) - 1u));
- uint v_5 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_5 = (v.tint_builtin_value_0 - 1u);
uint v_6 = min(uint(v_3), v_5);
ivec2 v_7 = ivec2(min(v_1, (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u))));
ivec3 v_8 = ivec3(v_7, int(v_4));
diff --git a/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.glsl
index 8f9d9fb..8bcc8ad 100644
--- a/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.glsl
@@ -5,25 +5,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D f_arg_0;
ivec4 textureLoad_f85291() {
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(f_arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_2), v_4));
ivec4 res = texelFetch(f_arg_0, v_5, int(v_3));
@@ -37,25 +32,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
ivec4 inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp isampler2D arg_0;
ivec4 textureLoad_f85291() {
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_2 = arg_1;
- uint v_3 = min(arg_2, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_3 = min(arg_2, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_4 = (uvec2(textureSize(arg_0, int(v_3))) - uvec2(1u));
ivec2 v_5 = ivec2(min(uvec2(v_2), v_4));
ivec4 res = texelFetch(arg_0, v_5, int(v_3));
@@ -71,18 +61,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
ivec4 prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
layout(location = 0) flat out ivec4 tint_interstage_location0;
@@ -90,7 +76,7 @@
ivec2 arg_1 = ivec2(1);
uint arg_2 = 1u;
ivec2 v_1 = arg_1;
- uint v_2 = min(arg_2, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_2 = min(arg_2, (v.tint_builtin_value_0 - 1u));
uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
ivec2 v_4 = ivec2(min(uvec2(v_1), v_3));
ivec4 res = texelFetch(v_arg_0, v_4, int(v_2));
diff --git a/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.glsl
index 219be87..a8e7e79 100644
--- a/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.glsl
@@ -5,18 +5,13 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray f_arg_0;
float textureLoad_ff1119() {
@@ -28,7 +23,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(f_arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_8 = (uvec2(textureSize(f_arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -43,18 +38,13 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
float inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uniform highp sampler2DArray arg_0;
float textureLoad_ff1119() {
@@ -66,7 +56,7 @@
uint v_4 = arg_3;
uint v_5 = (uint(textureSize(arg_0, 0).z) - 1u);
uint v_6 = min(uint(v_3), v_5);
- uint v_7 = min(v_4, (v_1.inner.tint_builtin_value_0 - 1u));
+ uint v_7 = min(v_4, (v_1.tint_builtin_value_0 - 1u));
uvec2 v_8 = (uvec2(textureSize(arg_0, int(v_7)).xy) - uvec2(1u));
ivec2 v_9 = ivec2(min(uvec2(v_2), v_8));
ivec3 v_10 = ivec3(v_9, int(v_6));
@@ -83,18 +73,14 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
float prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray v_arg_0;
layout(location = 0) flat out float tint_interstage_location0;
@@ -107,7 +93,7 @@
uint v_3 = arg_3;
uint v_4 = (uint(textureSize(v_arg_0, 0).z) - 1u);
uint v_5 = min(uint(v_2), v_4);
- uint v_6 = min(v_3, (v.inner.tint_builtin_value_0 - 1u));
+ uint v_6 = min(v_3, (v.tint_builtin_value_0 - 1u));
uvec2 v_7 = (uvec2(textureSize(v_arg_0, int(v_6)).xy) - uvec2(1u));
ivec2 v_8 = ivec2(min(uvec2(v_1), v_7));
ivec3 v_9 = ivec3(v_8, int(v_5));
diff --git a/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.glsl
index 01b2743..a1884b1 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_181090() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_181090() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_181090() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.glsl
index b0895e2..61d79d4 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_1a3fa9() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_1a3fa9() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_1a3fa9() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl
index 2c5b664..ea55c31 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_1a7fc3() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_1a7fc3() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_1a7fc3() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.glsl
index abea402..ed734ae 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2267d8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2267d8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_2267d8() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.glsl
index fce6a89..7c37ada 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_24b2c6() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_24b2c6() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_24b2c6() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.glsl
index 89b245e..38bed31 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2bea6c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2bea6c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_2bea6c() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.glsl
index def426a..1228ae1 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2df1ab() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_2df1ab() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_2df1ab() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.glsl
index 90a4eaf..cd5b86a 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_46dbd8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_46dbd8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_46dbd8() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.glsl
index 083e05e..8bea660 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_60d9b8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_60d9b8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_60d9b8() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.glsl
index a3cdbb7..ebf3b1a 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_903920() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_903920() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_903920() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.glsl
index 85eab13..de8161d 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_9a1a65() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_9a1a65() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_9a1a65() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.glsl
index 12cbaa2..b782151 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_adc783() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_adc783() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_adc783() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.glsl
index 224840b..44abc15 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_ae911c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_ae911c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_ae911c() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.glsl
index 4f7f38d..f0b2b7c 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c386c8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c386c8() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_c386c8() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl
index d9bd55b..6d78afa 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c399f9() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c399f9() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_c399f9() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.glsl
index a409c36..1f921a5 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c8c25c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_c8c25c() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_c8c25c() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.glsl
index 5aa0318..8e86060 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_d63126() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_d63126() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_d63126() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.glsl
index 2d12ffd..27766d3 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_d8f73b() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_d8f73b() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_d8f73b() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.glsl
index 18b2155..cc41688 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_ef7944() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_ef7944() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_ef7944() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.glsl
index eacdb9f..981e1c6 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_efd6df() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_efd6df() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_efd6df() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl
index 5bf9dc7..a029109 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_f742c0() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_f742c0() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_f742c0() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.glsl
index 8082470..f531464 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_fe2171() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumLevels_fe2171() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 460
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumLevels_fe2171() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.glsl
index f30a26e..2ec84d3 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_50f399() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_50f399() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumSamples_50f399() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.glsl
index 1a5f4f8..d5d5708 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_c1a777() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_c1a777() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumSamples_c1a777() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.glsl
index 484f877..bae18b9 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_dbb799() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_dbb799() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumSamples_dbb799() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.glsl
index 016dd1d..d322047 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.glsl
@@ -5,21 +5,16 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer f_prevent_dce_block_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_ecd321() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
void main() {
@@ -30,21 +25,16 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std430)
buffer prevent_dce_block_1_ssbo {
uint inner;
} v;
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v_1;
uint textureNumSamples_ecd321() {
- uint res = v_1.inner.tint_builtin_value_0;
+ uint res = v_1.tint_builtin_value_0;
return res;
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -57,22 +47,18 @@
#version 310 es
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
struct VertexOutput {
vec4 pos;
uint prevent_dce;
};
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
layout(location = 0) flat out uint tint_interstage_location0;
uint textureNumSamples_ecd321() {
- uint res = v.inner.tint_builtin_value_0;
+ uint res = v.tint_builtin_value_0;
return res;
}
VertexOutput vertex_main_inner() {
diff --git a/test/tint/builtins/textureLoad/texture_param.wgsl.expected.glsl b/test/tint/builtins/textureLoad/texture_param.wgsl.expected.glsl
index 3cd9d8b..739ac81 100644
--- a/test/tint/builtins/textureLoad/texture_param.wgsl.expected.glsl
+++ b/test/tint/builtins/textureLoad/texture_param.wgsl.expected.glsl
@@ -3,32 +3,28 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform v_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform v_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D v_arg_0;
-ivec4 textureLoad2d(ivec2 coords, int level, uint tint_tex_value) {
- uint v_1 = min(uint(level), (tint_tex_value - 1u));
- uvec2 v_2 = (uvec2(textureSize(v_arg_0, int(v_1))) - uvec2(1u));
- ivec2 v_3 = ivec2(min(uvec2(coords), v_2));
- return texelFetch(v_arg_0, v_3, int(v_1));
+ivec4 textureLoad2d(ivec2 coords, int level) {
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
+ uint v_2 = min(uint(level), v_1);
+ uvec2 v_3 = (uvec2(textureSize(v_arg_0, int(v_2))) - uvec2(1u));
+ ivec2 v_4 = ivec2(min(uvec2(coords), v_3));
+ return texelFetch(v_arg_0, v_4, int(v_2));
}
void doTextureLoad() {
- ivec4 res = textureLoad2d(ivec2(0), 0, v.inner.tint_builtin_value_0);
+ ivec4 res = textureLoad2d(ivec2(0), 0);
}
vec4 vertex_main_inner() {
doTextureLoad();
return vec4(0.0f);
}
void main() {
- vec4 v_4 = vertex_main_inner();
- gl_Position = vec4(v_4.x, -(v_4.y), ((2.0f * v_4.z) - v_4.w), v_4.w);
+ vec4 v_5 = vertex_main_inner();
+ gl_Position = vec4(v_5.x, -(v_5.y), ((2.0f * v_5.z) - v_5.w), v_5.w);
gl_PointSize = 1.0f;
}
//
@@ -38,24 +34,20 @@
precision highp float;
precision highp int;
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform f_tint_symbol_ubo {
- TintTextureUniformData inner;
+uniform f_TintTextureUniformData_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D f_arg_0;
-ivec4 textureLoad2d(ivec2 coords, int level, uint tint_tex_value) {
- uint v_1 = min(uint(level), (tint_tex_value - 1u));
- uvec2 v_2 = (uvec2(textureSize(f_arg_0, int(v_1))) - uvec2(1u));
- ivec2 v_3 = ivec2(min(uvec2(coords), v_2));
- return texelFetch(f_arg_0, v_3, int(v_1));
+ivec4 textureLoad2d(ivec2 coords, int level) {
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
+ uint v_2 = min(uint(level), v_1);
+ uvec2 v_3 = (uvec2(textureSize(f_arg_0, int(v_2))) - uvec2(1u));
+ ivec2 v_4 = ivec2(min(uvec2(coords), v_3));
+ return texelFetch(f_arg_0, v_4, int(v_2));
}
void doTextureLoad() {
- ivec4 res = textureLoad2d(ivec2(0), 0, v.inner.tint_builtin_value_0);
+ ivec4 res = textureLoad2d(ivec2(0), 0);
}
void main() {
doTextureLoad();
@@ -65,24 +57,20 @@
//
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp isampler2D arg_0;
-ivec4 textureLoad2d(ivec2 coords, int level, uint tint_tex_value) {
- uint v_1 = min(uint(level), (tint_tex_value - 1u));
- uvec2 v_2 = (uvec2(textureSize(arg_0, int(v_1))) - uvec2(1u));
- ivec2 v_3 = ivec2(min(uvec2(coords), v_2));
- return texelFetch(arg_0, v_3, int(v_1));
+ivec4 textureLoad2d(ivec2 coords, int level) {
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
+ uint v_2 = min(uint(level), v_1);
+ uvec2 v_3 = (uvec2(textureSize(arg_0, int(v_2))) - uvec2(1u));
+ ivec2 v_4 = ivec2(min(uvec2(coords), v_3));
+ return texelFetch(arg_0, v_4, int(v_2));
}
void doTextureLoad() {
- ivec4 res = textureLoad2d(ivec2(0), 0, v.inner.tint_builtin_value_0);
+ ivec4 res = textureLoad2d(ivec2(0), 0);
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
diff --git a/test/tint/types/texture/depth/2d.wgsl.expected.glsl b/test/tint/types/texture/depth/2d.wgsl.expected.glsl
index bf850c5..47d0fb0 100644
--- a/test/tint/types/texture/depth/2d.wgsl.expected.glsl
+++ b/test/tint/types/texture/depth/2d.wgsl.expected.glsl
@@ -1,17 +1,12 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2D t_f;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 dims = uvec2(textureSize(t_f, int(min(uint(0), v_1))));
}
diff --git a/test/tint/types/texture/depth/2d_array.wgsl.expected.glsl b/test/tint/types/texture/depth/2d_array.wgsl.expected.glsl
index 01d1a59..1963ec7 100644
--- a/test/tint/types/texture/depth/2d_array.wgsl.expected.glsl
+++ b/test/tint/types/texture/depth/2d_array.wgsl.expected.glsl
@@ -1,17 +1,12 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp sampler2DArray t_f;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 dims = uvec2(textureSize(t_f, int(min(uint(0), v_1))).xy);
}
diff --git a/test/tint/types/texture/depth/cube.wgsl.expected.glsl b/test/tint/types/texture/depth/cube.wgsl.expected.glsl
index 1d98f3f..6a74798 100644
--- a/test/tint/types/texture/depth/cube.wgsl.expected.glsl
+++ b/test/tint/types/texture/depth/cube.wgsl.expected.glsl
@@ -1,17 +1,12 @@
#version 310 es
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCube t_f;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 dims = uvec2(textureSize(t_f, int(min(uint(0), v_1))));
}
diff --git a/test/tint/types/texture/depth/cube_array.wgsl.expected.glsl b/test/tint/types/texture/depth/cube_array.wgsl.expected.glsl
index 61fe19e..629a304 100644
--- a/test/tint/types/texture/depth/cube_array.wgsl.expected.glsl
+++ b/test/tint/types/texture/depth/cube_array.wgsl.expected.glsl
@@ -1,17 +1,12 @@
#version 460
-
-struct TintTextureUniformData {
- uint tint_builtin_value_0;
-};
-
layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
+uniform TintTextureUniformData_1_ubo {
+ uint tint_builtin_value_0;
} v;
uniform highp samplerCubeArray t_f;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 dims = uvec2(textureSize(t_f, int(min(uint(0), v_1))).xy);
}
diff --git a/test/tint/types/texture/sampled/1d.wgsl.expected.glsl b/test/tint/types/texture/sampled/1d.wgsl.expected.glsl
index 9473c3f..927ca3c 100644
--- a/test/tint/types/texture/sampled/1d.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/1d.wgsl.expected.glsl
@@ -1,25 +1,20 @@
#version 310 es
-
-struct TintTextureUniformData {
+layout(binding = 0, std140)
+uniform TintTextureUniformData_1_ubo {
uint tint_builtin_value_0;
uint tint_builtin_value_1;
uint tint_builtin_value_2;
-};
-
-layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
} v;
uniform highp sampler2D t_f;
uniform highp isampler2D t_i;
uniform highp usampler2D t_u;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uint fdims = uvec2(textureSize(t_f, int(min(uint(1), v_1)))).x;
- uint v_2 = (v.inner.tint_builtin_value_1 - 1u);
+ uint v_2 = (v.tint_builtin_value_1 - 1u);
uint idims = uvec2(textureSize(t_i, int(min(uint(1), v_2)))).x;
- uint v_3 = (v.inner.tint_builtin_value_2 - 1u);
+ uint v_3 = (v.tint_builtin_value_2 - 1u);
uint udims = uvec2(textureSize(t_u, int(min(uint(1), v_3)))).x;
}
diff --git a/test/tint/types/texture/sampled/2d.wgsl.expected.glsl b/test/tint/types/texture/sampled/2d.wgsl.expected.glsl
index 592c999..f7ee94e 100644
--- a/test/tint/types/texture/sampled/2d.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/2d.wgsl.expected.glsl
@@ -1,25 +1,20 @@
#version 310 es
-
-struct TintTextureUniformData {
+layout(binding = 0, std140)
+uniform TintTextureUniformData_1_ubo {
uint tint_builtin_value_0;
uint tint_builtin_value_1;
uint tint_builtin_value_2;
-};
-
-layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
} v;
uniform highp sampler2D t_f;
uniform highp isampler2D t_i;
uniform highp usampler2D t_u;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 fdims = uvec2(textureSize(t_f, int(min(uint(1), v_1))));
- uint v_2 = (v.inner.tint_builtin_value_1 - 1u);
+ uint v_2 = (v.tint_builtin_value_1 - 1u);
uvec2 idims = uvec2(textureSize(t_i, int(min(uint(1), v_2))));
- uint v_3 = (v.inner.tint_builtin_value_2 - 1u);
+ uint v_3 = (v.tint_builtin_value_2 - 1u);
uvec2 udims = uvec2(textureSize(t_u, int(min(uint(1), v_3))));
}
diff --git a/test/tint/types/texture/sampled/2d_array.wgsl.expected.glsl b/test/tint/types/texture/sampled/2d_array.wgsl.expected.glsl
index d7ff15c..af24d82 100644
--- a/test/tint/types/texture/sampled/2d_array.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/2d_array.wgsl.expected.glsl
@@ -1,25 +1,20 @@
#version 310 es
-
-struct TintTextureUniformData {
+layout(binding = 0, std140)
+uniform TintTextureUniformData_1_ubo {
uint tint_builtin_value_0;
uint tint_builtin_value_1;
uint tint_builtin_value_2;
-};
-
-layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
} v;
uniform highp sampler2DArray t_f;
uniform highp isampler2DArray t_i;
uniform highp usampler2DArray t_u;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 fdims = uvec2(textureSize(t_f, int(min(uint(1), v_1))).xy);
- uint v_2 = (v.inner.tint_builtin_value_1 - 1u);
+ uint v_2 = (v.tint_builtin_value_1 - 1u);
uvec2 idims = uvec2(textureSize(t_i, int(min(uint(1), v_2))).xy);
- uint v_3 = (v.inner.tint_builtin_value_2 - 1u);
+ uint v_3 = (v.tint_builtin_value_2 - 1u);
uvec2 udims = uvec2(textureSize(t_u, int(min(uint(1), v_3))).xy);
}
diff --git a/test/tint/types/texture/sampled/3d.wgsl.expected.glsl b/test/tint/types/texture/sampled/3d.wgsl.expected.glsl
index daa1904..2217b20 100644
--- a/test/tint/types/texture/sampled/3d.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/3d.wgsl.expected.glsl
@@ -1,25 +1,20 @@
#version 310 es
-
-struct TintTextureUniformData {
+layout(binding = 0, std140)
+uniform TintTextureUniformData_1_ubo {
uint tint_builtin_value_0;
uint tint_builtin_value_1;
uint tint_builtin_value_2;
-};
-
-layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
} v;
uniform highp sampler3D t_f;
uniform highp isampler3D t_i;
uniform highp usampler3D t_u;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec3 fdims = uvec3(textureSize(t_f, int(min(uint(1), v_1))));
- uint v_2 = (v.inner.tint_builtin_value_1 - 1u);
+ uint v_2 = (v.tint_builtin_value_1 - 1u);
uvec3 idims = uvec3(textureSize(t_i, int(min(uint(1), v_2))));
- uint v_3 = (v.inner.tint_builtin_value_2 - 1u);
+ uint v_3 = (v.tint_builtin_value_2 - 1u);
uvec3 udims = uvec3(textureSize(t_u, int(min(uint(1), v_3))));
}
diff --git a/test/tint/types/texture/sampled/cube.wgsl.expected.glsl b/test/tint/types/texture/sampled/cube.wgsl.expected.glsl
index 861e926..7434c79 100644
--- a/test/tint/types/texture/sampled/cube.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/cube.wgsl.expected.glsl
@@ -1,25 +1,20 @@
#version 310 es
-
-struct TintTextureUniformData {
+layout(binding = 0, std140)
+uniform TintTextureUniformData_1_ubo {
uint tint_builtin_value_0;
uint tint_builtin_value_1;
uint tint_builtin_value_2;
-};
-
-layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
} v;
uniform highp samplerCube t_f;
uniform highp isamplerCube t_i;
uniform highp usamplerCube t_u;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 fdims = uvec2(textureSize(t_f, int(min(uint(1), v_1))));
- uint v_2 = (v.inner.tint_builtin_value_1 - 1u);
+ uint v_2 = (v.tint_builtin_value_1 - 1u);
uvec2 idims = uvec2(textureSize(t_i, int(min(uint(1), v_2))));
- uint v_3 = (v.inner.tint_builtin_value_2 - 1u);
+ uint v_3 = (v.tint_builtin_value_2 - 1u);
uvec2 udims = uvec2(textureSize(t_u, int(min(uint(1), v_3))));
}
diff --git a/test/tint/types/texture/sampled/cube_array.wgsl.expected.glsl b/test/tint/types/texture/sampled/cube_array.wgsl.expected.glsl
index 44fa550..e3d45d1 100644
--- a/test/tint/types/texture/sampled/cube_array.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/cube_array.wgsl.expected.glsl
@@ -1,25 +1,20 @@
#version 460
-
-struct TintTextureUniformData {
+layout(binding = 0, std140)
+uniform TintTextureUniformData_1_ubo {
uint tint_builtin_value_0;
uint tint_builtin_value_1;
uint tint_builtin_value_2;
-};
-
-layout(binding = 0, std140)
-uniform tint_symbol_1_ubo {
- TintTextureUniformData inner;
} v;
uniform highp samplerCubeArray t_f;
uniform highp isamplerCubeArray t_i;
uniform highp usamplerCubeArray t_u;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
- uint v_1 = (v.inner.tint_builtin_value_0 - 1u);
+ uint v_1 = (v.tint_builtin_value_0 - 1u);
uvec2 fdims = uvec2(textureSize(t_f, int(min(uint(1), v_1))).xy);
- uint v_2 = (v.inner.tint_builtin_value_1 - 1u);
+ uint v_2 = (v.tint_builtin_value_1 - 1u);
uvec2 idims = uvec2(textureSize(t_i, int(min(uint(1), v_2))).xy);
- uint v_3 = (v.inner.tint_builtin_value_2 - 1u);
+ uint v_3 = (v.tint_builtin_value_2 - 1u);
uvec2 udims = uvec2(textureSize(t_u, int(min(uint(1), v_3))).xy);
}
