Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 896b031

Browse files
committed
Roll ANGLE from 094b49d to 32175d
1 parent 7dc5e7e commit 896b031

File tree

9 files changed

+31
-4
lines changed

9 files changed

+31
-4
lines changed

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ deps = {
263263
Var('github_git') + '/google/shaderc.git' + '@' + '7ea834ecc59258a5c13c3d3e6fa0582bdde7c543',
264264

265265
'src/third_party/vulkan-deps':
266-
Var('chromium_git') + '/vulkan-deps' + '@' + 'afc444a0f49a09f67b3dc63ddcd14e2031466ffa',
266+
Var('chromium_git') + '/vulkan-deps' + '@' + 'a56166d59ebdb0208a7301d267460773df1a1adc',
267267

268268
'src/third_party/flatbuffers':
269269
Var('github_git') + '/google/flatbuffers.git' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
@@ -592,10 +592,10 @@ deps = {
592592
Var('fuchsia_git') + '/third_party/Vulkan-Headers.git' + '@' + '32640ad82ef648768c706c9bf828b77123a09bc2',
593593

594594
'src/third_party/swiftshader':
595-
Var('swiftshader_git') + '/SwiftShader.git' + '@' + 'bea8d2471bd912220ba59032e0738f3364632657',
595+
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5f9ed9b16931c7155171d31f75004f73f0a3abc8',
596596

597597
'src/third_party/angle':
598-
Var('chromium_git') + '/angle/angle.git' + '@' + '094b49db60cb48ee932a875898b57accbfa656de',
598+
Var('chromium_git') + '/angle/angle.git' + '@' + '32175d8a6dc185dd850e5c9988f208085c9c0d80',
599599

600600
'src/third_party/vulkan_memory_allocator':
601601
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',

impeller/compiler/spirv_sksl.cc

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,30 @@ bool CompilerSkSL::emit_global_variable_resources() {
327327
return emitted;
328328
}
329329

330+
bool CompilerSkSL::emit_undefined_values() {
331+
bool emitted = false;
332+
333+
ir.for_each_typed_id<SPIRUndef>([&](uint32_t, const SPIRUndef& undef) {
334+
auto& type = this->get<SPIRType>(undef.basetype);
335+
// OpUndef can be void for some reason ...
336+
if (type.basetype == SPIRType::Void) {
337+
return;
338+
}
339+
340+
std::string initializer;
341+
if (options.force_zero_initialized_variables &&
342+
type_can_zero_initialize(type)) {
343+
initializer = join(" = ", to_zero_initialized_expression(undef.basetype));
344+
}
345+
346+
statement(variable_decl(type, to_name(undef.self), undef.self), initializer,
347+
";");
348+
emitted = true;
349+
});
350+
351+
return emitted;
352+
}
353+
330354
void CompilerSkSL::emit_resources() {
331355
detect_unsupported_resources();
332356

@@ -350,7 +374,9 @@ void CompilerSkSL::emit_resources() {
350374
statement("");
351375
}
352376

353-
declare_undefined_values();
377+
if (emit_undefined_values()) {
378+
statement("");
379+
}
354380
}
355381

356382
void CompilerSkSL::emit_interface_block(const SPIRVariable& var) {

impeller/compiler/spirv_sksl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class CompilerSkSL : public spirv_cross::CompilerGLSL {
4646
bool emit_uniform_resources();
4747
bool emit_output_resources();
4848
bool emit_global_variable_resources();
49+
bool emit_undefined_values();
4950
void emit_resources();
5051

5152
void emit_interface_block(const spirv_cross::SPIRVariable& var);
-120 Bytes
Loading
-783 Bytes
Loading
-760 Bytes
Loading
-63 Bytes
Loading
Loading
-751 Bytes
Loading

0 commit comments

Comments
 (0)