Hash :
50fc2909
Author :
Date :
2021-10-27T21:37:02
Merge Webkit up to Oct 27 2021
Merge the following commits from Webkit. This
change merges webkit from the following git commits
Previous:
commit 703b234524e75109ca3e94febbf63098314022f5
Author: Alex Christensen <achristensen@webkit.org>
Date: Tue Sep 28 16:22:30 2021 +0000
Mostly fix Mac CMake build
https://bugs.webkit.org/show_bug.cgi?id=230868
Current:
commit 43d2e637f84b1e6b75c139ac64c26ca108b4f12f
Author: Kimmo Kinnunen <kkinnunen@apple.com>
Date: Wed Oct 27 17:43:38 2021 +0000
REGRESSION (Safari 15): Poor WebGL performance on
https://downloads.scirra.com/labs/particles
Commits:
commit 8238f462c96e515dabd3db0e26c143b18f47340c
Author: Kyle Piddington <kpiddington@apple.com>
Date: Wed Oct 6 21:45:18 2021 +0000
Shadertoy "truchet district" fails to compile with error:
Internal error compiling shader with Metal backend"
commit 2fcb9af290e4b6c804f11ad4359555507c1492f9
Author: Kyle Piddington <kpiddington@apple.com>
Date: Thu Oct 14 21:14:26 2021 +0000
https://tankionline.com/play/ html5 engine not
working: crashes. (Metal shader not working)
https://bugs.webkit.org/show_bug.cgi?id=231490
commit e11955a258380a875115ded16ab8963142c4023b
Author: Kyle Piddington <kpiddington@apple.com>
Date: Fri Oct 15 23:57:12 2021 +0000
REGRESSION (r283667):
webgl/2.0.0/deqp/functional/gles3/lifetime.html fails
https://bugs.webkit.org/show_bug.cgi?id=231682
commit 43d2e637f84b1e6b75c139ac64c26ca108b4f12f
Author: Kimmo Kinnunen <kkinnunen@apple.com>
Date: Wed Oct 27 17:43:38 2021 +0000
REGRESSION (Safari 15): Poor WebGL performance on
https://downloads.scirra.com/labs/particles
https://bugs.webkit.org/show_bug.cgi?id=230749
Bug: angleproject:6630
Change-Id: Icca411dc429538f839f05834f1851fbc54ef8a1d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3248573
Commit-Queue: Kyle Piddington <kpiddington@apple.com>
Reviewed-by: Gregg Tavares <gman@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
//
// Copyright 2020 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#include <cctype>
#include <cstring>
#include <limits>
#include <unordered_map>
#include <unordered_set>
#include "compiler/translator/TranslatorMetalDirect/IdGen.h"
using namespace sh;
////////////////////////////////////////////////////////////////////////////////
IdGen::IdGen() {}
template <typename String, typename StringToImmutable>
Name IdGen::createNewName(size_t count,
const String *baseNames,
const StringToImmutable &toImmutable)
{
const unsigned id = mNext++;
char idBuffer[std::numeric_limits<unsigned>::digits10 + 1];
sprintf(idBuffer, "%u", id);
mNewNameBuffer.clear();
mNewNameBuffer += '_';
mNewNameBuffer += idBuffer;
// Note:
// Double underscores are only allowed in C++ (and thus Metal) vendor identifiers, so here we
// take care not to introduce any.
for (size_t i = 0; i < count; ++i)
{
const ImmutableString baseName = toImmutable(baseNames[i]);
if (!baseName.empty())
{
const char *base = baseName.data();
if (baseName.beginsWith(kAngleInternalPrefix))
{
base += sizeof(kAngleInternalPrefix) - 1;
}
if (*base == '_')
{
++base;
}
ASSERT(*base != '_');
if (mNewNameBuffer.back() != '_')
{
mNewNameBuffer += '_';
}
mNewNameBuffer += base;
}
}
return Name(ImmutableString(mNewNameBuffer), SymbolType::AngleInternal);
}
Name IdGen::createNewName(const ImmutableString &baseName)
{
return createNewName({baseName});
}
Name IdGen::createNewName(const Name &baseName)
{
return createNewName(baseName.rawName());
}
Name IdGen::createNewName(const char *baseName)
{
return createNewName(ImmutableString(baseName));
}
Name IdGen::createNewName(std::initializer_list<ImmutableString> baseNames)
{
return createNewName(baseNames.size(), baseNames.begin(),
[](const ImmutableString &s) { return s; });
}
Name IdGen::createNewName(std::initializer_list<Name> baseNames)
{
return createNewName(baseNames.size(), baseNames.begin(),
[](const Name &s) { return s.rawName(); });
}
Name IdGen::createNewName(std::initializer_list<const char *> baseNames)
{
return createNewName(baseNames.size(), baseNames.begin(),
[](const char *s) { return ImmutableString(s); });
}
Name IdGen::createNewName()
{
// TODO(anglebug.com/5505): refactor this later.
return createNewName<int>(0, nullptr, [](int) { return kEmptyImmutableString; });
}