| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Sun, 10 Jul 2022 10:35:20 +0200 | |
| branch | firefox102 |
| changeset 1175 | 4c6576f9cf04 |
| parent 1174 | 90e3d0cf8567 |
| child 1177 | 4bb6d80fcc64 |
| permissions | -rw-r--r-- |
| 1164 | 1 |
# HG changeset patch |
| 1175 | 2 |
# Parent 72e5683524907256ec499f82bac513c29760b332 |
| 1164 | 3 |
|
| 1175 | 4 |
Index: firefox-102.0/Cargo.lock |
5 |
=================================================================== |
|
6 |
--- firefox-102.0.orig/Cargo.lock |
|
7 |
+++ firefox-102.0/Cargo.lock |
|
8 |
@@ -2218,8 +2218,6 @@ dependencies = [ |
|
| 1162 | 9 |
[[package]] |
10 |
name = "glslopt" |
|
11 |
version = "0.1.9" |
|
12 |
-source = "registry+https://github.com/rust-lang/crates.io-index" |
|
13 |
-checksum = "74a3f5c04450dfdadb4b08f6e5ee6f5110f674de1acbd6199bfec68392a8cbaf" |
|
14 |
dependencies = [ |
|
15 |
"cc", |
|
16 |
] |
|
| 1175 | 17 |
Index: firefox-102.0/Cargo.toml |
18 |
=================================================================== |
|
19 |
--- firefox-102.0.orig/Cargo.toml |
|
20 |
+++ firefox-102.0/Cargo.toml |
|
21 |
@@ -116,6 +116,7 @@ libudev-sys = { path = "dom/webauthn/lib
|
|
|
1174
90e3d0cf8567
Firefox 101.x release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1172
diff
changeset
|
22 |
packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="c149d0a519bf878567c7630096737669ec2ff15f" }
|
| 1171 | 23 |
midir = { git = "https://github.com/mozilla/midir.git", rev = "4c11f0ffb5d6a10de4aff40a7b81218b33b94e6f" }
|
| 1175 | 24 |
minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" }
|
25 |
+glslopt = { path = "third_party/rust/glslopt/" }
|
|
|
1174
90e3d0cf8567
Firefox 101.x release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1172
diff
changeset
|
26 |
|
| 1171 | 27 |
# Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2. |
28 |
# There is not going to be new version of mio 0.6, mio now being >= 0.7.11. |
|
| 1175 | 29 |
Index: firefox-102.0/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
30 |
=================================================================== |
|
31 |
--- firefox-102.0.orig/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
|
32 |
+++ firefox-102.0/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
|
33 |
@@ -41,6 +41,7 @@ static inline SkMatrix SkEncodedOriginTo |
|
| 1162 | 34 |
case kLeftBottom_SkEncodedOrigin: return SkMatrix::MakeAll( 0, 1, 0, -1, 0, w, 0, 0, 1); |
35 |
} |
|
36 |
SK_ABORT("Unexpected origin");
|
|
37 |
+ SkUNREACHABLE; |
|
38 |
} |
|
39 |
||
40 |
||
| 1175 | 41 |
Index: firefox-102.0/gfx/skia/skia/include/private/GrTypesPriv.h |
42 |
=================================================================== |
|
43 |
--- firefox-102.0.orig/gfx/skia/skia/include/private/GrTypesPriv.h |
|
44 |
+++ firefox-102.0/gfx/skia/skia/include/private/GrTypesPriv.h |
|
45 |
@@ -540,6 +540,7 @@ static inline GrSLType GrSLCombinedSampl |
|
| 1162 | 46 |
default: |
47 |
SK_ABORT("Unexpected texture type");
|
|
48 |
} |
|
49 |
+ SkUNREACHABLE; |
|
50 |
} |
|
51 |
||
52 |
/** Rectangle and external textures only support the clamp wrap mode and do not support |
|
| 1175 | 53 |
@@ -556,6 +557,7 @@ static inline bool GrTextureTypeHasRestr |
| 1162 | 54 |
default: |
55 |
SK_ABORT("Unexpected texture type");
|
|
56 |
} |
|
57 |
+ SkUNREACHABLE; |
|
58 |
} |
|
59 |
||
60 |
static constexpr bool GrSLTypeIsCombinedSamplerType(GrSLType type) {
|
|
| 1175 | 61 |
@@ -858,6 +860,7 @@ static inline size_t GrCompressedFormatD |
| 1162 | 62 |
} |
63 |
||
64 |
SK_ABORT("Invalid pixel config");
|
|
65 |
+ SkUNREACHABLE; |
|
66 |
} |
|
67 |
||
68 |
/** |
|
| 1175 | 69 |
Index: firefox-102.0/gfx/skia/skia/src/core/SkGeometry.h |
70 |
=================================================================== |
|
71 |
--- firefox-102.0.orig/gfx/skia/skia/src/core/SkGeometry.h |
|
72 |
+++ firefox-102.0/gfx/skia/skia/src/core/SkGeometry.h |
|
73 |
@@ -182,6 +182,7 @@ static inline bool SkCubicIsDegenerate(S |
|
| 1162 | 74 |
return true; |
75 |
} |
|
76 |
SK_ABORT("Invalid SkCubicType");
|
|
77 |
+ SkUNREACHABLE; |
|
78 |
} |
|
79 |
||
80 |
static inline const char* SkCubicTypeName(SkCubicType type) {
|
|
| 1175 | 81 |
@@ -194,6 +195,7 @@ static inline const char* SkCubicTypeNam |
| 1162 | 82 |
case SkCubicType::kLineOrPoint: return "kLineOrPoint"; |
83 |
} |
|
84 |
SK_ABORT("Invalid SkCubicType");
|
|
85 |
+ SkUNREACHABLE; |
|
86 |
} |
|
87 |
||
88 |
/** Returns the cubic classification. |
|
| 1175 | 89 |
Index: firefox-102.0/gfx/skia/skia/src/core/SkTextBlob.cpp |
90 |
=================================================================== |
|
91 |
--- firefox-102.0.orig/gfx/skia/skia/src/core/SkTextBlob.cpp |
|
92 |
+++ firefox-102.0/gfx/skia/skia/src/core/SkTextBlob.cpp |
|
93 |
@@ -201,6 +201,7 @@ void SkTextBlob::operator delete(void* p |
|
| 1162 | 94 |
|
95 |
void* SkTextBlob::operator new(size_t) {
|
|
96 |
SK_ABORT("All blobs are created by placement new.");
|
|
97 |
+ SkUNREACHABLE; |
|
98 |
} |
|
99 |
||
100 |
void* SkTextBlob::operator new(size_t, void* p) {
|
|
| 1175 | 101 |
Index: firefox-102.0/gfx/skia/skia/src/core/SkTypeface_remote.cpp |
102 |
=================================================================== |
|
103 |
--- firefox-102.0.orig/gfx/skia/skia/src/core/SkTypeface_remote.cpp |
|
104 |
+++ firefox-102.0/gfx/skia/skia/src/core/SkTypeface_remote.cpp |
|
105 |
@@ -29,6 +29,7 @@ void SkScalerContextProxy::initCache(SkS |
|
| 1162 | 106 |
|
107 |
unsigned SkScalerContextProxy::generateGlyphCount() {
|
|
108 |
SK_ABORT("Should never be called.");
|
|
109 |
+ SkUNREACHABLE; |
|
110 |
} |
|
111 |
||
112 |
bool SkScalerContextProxy::generateAdvance(SkGlyph* glyph) {
|
|
| 1175 | 113 |
Index: firefox-102.0/gfx/skia/skia/src/core/SkTypeface_remote.h |
114 |
=================================================================== |
|
115 |
--- firefox-102.0.orig/gfx/skia/skia/src/core/SkTypeface_remote.h |
|
116 |
+++ firefox-102.0/gfx/skia/skia/src/core/SkTypeface_remote.h |
|
117 |
@@ -63,23 +63,28 @@ public: |
|
| 1162 | 118 |
bool isLogging() const {return fIsLogging;}
|
119 |
||
120 |
protected: |
|
121 |
- int onGetUPEM() const override { SK_ABORT("Should never be called."); }
|
|
122 |
+ int onGetUPEM() const override { SK_ABORT("Should never be called."); SkUNREACHABLE; }
|
|
123 |
std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override {
|
|
124 |
SK_ABORT("Should never be called.");
|
|
125 |
+ SkUNREACHABLE; |
|
126 |
} |
|
127 |
std::unique_ptr<SkFontData> onMakeFontData() const override {
|
|
128 |
SK_ABORT("Should never be called.");
|
|
129 |
+ SkUNREACHABLE; |
|
130 |
} |
|
131 |
sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override {
|
|
132 |
SK_ABORT("Should never be called.");
|
|
133 |
+ SkUNREACHABLE; |
|
134 |
} |
|
135 |
int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[], |
|
136 |
int coordinateCount) const override {
|
|
137 |
SK_ABORT("Should never be called.");
|
|
138 |
+ SkUNREACHABLE; |
|
139 |
} |
|
140 |
int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[], |
|
141 |
int parameterCount) const override {
|
|
142 |
SK_ABORT("Should never be called.");
|
|
143 |
+ SkUNREACHABLE; |
|
144 |
} |
|
145 |
void onGetFamilyName(SkString* familyName) const override {
|
|
146 |
// Used by SkStrikeCache::DumpMemoryStatistics. |
|
| 1175 | 147 |
@@ -87,12 +92,15 @@ protected: |
| 1162 | 148 |
} |
149 |
SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override {
|
|
150 |
SK_ABORT("Should never be called.");
|
|
151 |
+ SkUNREACHABLE; |
|
152 |
} |
|
153 |
int onGetTableTags(SkFontTableTag tags[]) const override {
|
|
154 |
SK_ABORT("Should never be called.");
|
|
155 |
+ SkUNREACHABLE; |
|
156 |
} |
|
157 |
size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const override {
|
|
158 |
SK_ABORT("Should never be called.");
|
|
159 |
+ SkUNREACHABLE; |
|
160 |
} |
|
161 |
SkScalerContext* onCreateScalerContext(const SkScalerContextEffects& effects, |
|
162 |
const SkDescriptor* desc) const override {
|
|
| 1175 | 163 |
@@ -116,6 +124,7 @@ protected: |
| 1162 | 164 |
|
165 |
std::unique_ptr<SkAdvancedTypefaceMetrics> onGetAdvancedMetrics() const override {
|
|
166 |
SK_ABORT("Should never be called.");
|
|
167 |
+ SkUNREACHABLE; |
|
168 |
} |
|
169 |
void onCharsToGlyphs(const SkUnichar* chars, int count, SkGlyphID glyphs[]) const override {
|
|
170 |
SK_ABORT("Should never be called.");
|
|
| 1175 | 171 |
@@ -126,6 +135,7 @@ protected: |
| 1162 | 172 |
|
173 |
void* onGetCTFontRef() const override {
|
|
174 |
SK_ABORT("Should never be called.");
|
|
175 |
+ SkUNREACHABLE; |
|
176 |
} |
|
177 |
||
178 |
private: |
|
| 1175 | 179 |
Index: firefox-102.0/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp |
180 |
=================================================================== |
|
181 |
--- firefox-102.0.orig/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp |
|
182 |
+++ firefox-102.0/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp |
|
183 |
@@ -144,6 +144,7 @@ static GrTextureDomain::Mode to_texture_ |
|
| 1162 | 184 |
return GrTextureDomain::kRepeat_Mode; |
185 |
default: |
|
186 |
SK_ABORT("Unsupported tile mode.");
|
|
187 |
+ SkUNREACHABLE; |
|
188 |
} |
|
189 |
} |
|
190 |
#endif |
|
| 1175 | 191 |
Index: firefox-102.0/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp |
192 |
=================================================================== |
|
193 |
--- firefox-102.0.orig/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp |
|
194 |
+++ firefox-102.0/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp |
|
195 |
@@ -1701,6 +1701,7 @@ static SkImageFilterLight* create_random |
|
| 1162 | 196 |
} |
197 |
default: |
|
198 |
SK_ABORT("Unexpected value.");
|
|
199 |
+ SkUNREACHABLE; |
|
200 |
} |
|
201 |
} |
|
202 |
||
| 1175 | 203 |
Index: firefox-102.0/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp |
204 |
=================================================================== |
|
205 |
--- firefox-102.0.orig/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp |
|
206 |
+++ firefox-102.0/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp |
|
207 |
@@ -69,6 +69,7 @@ void SkFontMgr_Indirect::onGetFamilyName |
|
| 1162 | 208 |
|
209 |
SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const {
|
|
210 |
SK_ABORT("Not implemented");
|
|
211 |
+ SkUNREACHABLE; |
|
212 |
} |
|
213 |
||
214 |
SkFontStyleSet* SkFontMgr_Indirect::onMatchFamily(const char familyName[]) const {
|
|
| 1175 | 215 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/GrDataUtils.cpp |
216 |
=================================================================== |
|
217 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/GrDataUtils.cpp |
|
218 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/GrDataUtils.cpp |
|
219 |
@@ -128,6 +128,7 @@ size_t GrCompressedDataSize(SkImage::Com |
|
| 1162 | 220 |
return numBlocks * sizeof(ETC1Block); |
221 |
} |
|
222 |
SK_ABORT("Unexpected compression type");
|
|
223 |
+ SkUNREACHABLE; |
|
224 |
} |
|
225 |
||
226 |
size_t GrCompressedRowBytes(SkImage::CompressionType type, int width) {
|
|
| 1175 | 227 |
@@ -137,6 +138,7 @@ size_t GrCompressedRowBytes(SkImage::Com |
| 1162 | 228 |
return numBlocksWidth * sizeof(ETC1Block); |
229 |
} |
|
230 |
SK_ABORT("Unexpected compression type");
|
|
231 |
+ SkUNREACHABLE; |
|
232 |
} |
|
233 |
||
234 |
// Fill in 'dest' with ETC1 blocks derived from 'colorf' |
|
| 1175 | 235 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/GrFragmentProcessor.h |
236 |
=================================================================== |
|
237 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/GrFragmentProcessor.h |
|
238 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/GrFragmentProcessor.h |
|
239 |
@@ -375,6 +375,7 @@ protected: |
|
| 1162 | 240 |
private: |
241 |
virtual SkPMColor4f constantOutputForConstantInput(const SkPMColor4f& /* inputColor */) const {
|
|
242 |
SK_ABORT("Subclass must override this if advertising this optimization.");
|
|
243 |
+ SkUNREACHABLE; |
|
244 |
} |
|
245 |
||
246 |
/** Returns a new instance of the appropriate *GL* implementation class |
|
| 1175 | 247 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/GrPathRendering.cpp |
248 |
=================================================================== |
|
249 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/GrPathRendering.cpp |
|
250 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/GrPathRendering.cpp |
|
251 |
@@ -19,6 +19,7 @@ const GrUserStencilSettings& GrPathRende |
|
| 1162 | 252 |
switch (fill) {
|
253 |
default: |
|
254 |
SK_ABORT("Unexpected path fill.");
|
|
255 |
+ SkUNREACHABLE; |
|
256 |
case GrPathRendering::kWinding_FillType: {
|
|
257 |
constexpr static GrUserStencilSettings kWindingStencilPass( |
|
258 |
GrUserStencilSettings::StaticInit< |
|
| 1175 | 259 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/GrPathRendering.h |
260 |
=================================================================== |
|
261 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/GrPathRendering.h |
|
262 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/GrPathRendering.h |
|
263 |
@@ -63,6 +63,7 @@ public: |
|
| 1162 | 264 |
|
265 |
default: |
|
266 |
SK_ABORT("Unknown path transform type");
|
|
267 |
+ SkUNREACHABLE; |
|
268 |
} |
|
269 |
} |
|
270 |
||
| 1175 | 271 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp |
272 |
=================================================================== |
|
273 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp |
|
274 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp |
|
275 |
@@ -20,6 +20,7 @@ std::unique_ptr<GrFragmentProcessor> GrP |
|
| 1162 | 276 |
return fp; |
277 |
#else |
|
278 |
SK_ABORT("Should not be called if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS");
|
|
279 |
+ SkUNREACHABLE; |
|
280 |
#endif |
|
281 |
} |
|
282 |
#endif |
|
| 1175 | 283 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/GrReducedClip.cpp |
284 |
=================================================================== |
|
285 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/GrReducedClip.cpp |
|
286 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/GrReducedClip.cpp |
|
287 |
@@ -525,6 +525,7 @@ GrReducedClip::ClipResult GrReducedClip: |
|
| 1162 | 288 |
} |
289 |
||
290 |
SK_ABORT("Unexpected DeviceSpaceType");
|
|
291 |
+ SkUNREACHABLE; |
|
292 |
} |
|
293 |
||
294 |
GrReducedClip::ClipResult GrReducedClip::clipOutsideElement(const Element* element) {
|
|
| 1175 | 295 |
@@ -591,6 +592,7 @@ GrReducedClip::ClipResult GrReducedClip: |
| 1162 | 296 |
} |
297 |
||
298 |
SK_ABORT("Unexpected DeviceSpaceType");
|
|
299 |
+ SkUNREACHABLE; |
|
300 |
} |
|
301 |
||
302 |
inline void GrReducedClip::addWindowRectangle(const SkRect& elementInteriorRect, bool elementIsAA) {
|
|
| 1175 | 303 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/GrResourceCache.cpp |
304 |
=================================================================== |
|
305 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/GrResourceCache.cpp |
|
306 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/GrResourceCache.cpp |
|
307 |
@@ -40,6 +40,7 @@ GrScratchKey::ResourceType GrScratchKey: |
|
| 1162 | 308 |
int32_t type = nextType++; |
309 |
if (type > SkTo<int32_t>(UINT16_MAX)) {
|
|
310 |
SK_ABORT("Too many Resource Types");
|
|
311 |
+ SkUNREACHABLE; |
|
312 |
} |
|
313 |
||
314 |
return static_cast<ResourceType>(type); |
|
| 1175 | 315 |
@@ -51,6 +52,7 @@ GrUniqueKey::Domain GrUniqueKey::Generat |
| 1162 | 316 |
int32_t domain = nextDomain++; |
317 |
if (domain > SkTo<int32_t>(UINT16_MAX)) {
|
|
318 |
SK_ABORT("Too many GrUniqueKey Domains");
|
|
319 |
+ SkUNREACHABLE; |
|
320 |
} |
|
321 |
||
322 |
return static_cast<Domain>(domain); |
|
| 1175 | 323 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/GrShaderVar.cpp |
324 |
=================================================================== |
|
325 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/GrShaderVar.cpp |
|
326 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/GrShaderVar.cpp |
|
327 |
@@ -18,6 +18,7 @@ static const char* type_modifier_string( |
|
| 1162 | 328 |
case GrShaderVar::kUniform_TypeModifier: return "uniform"; |
329 |
} |
|
330 |
SK_ABORT("Unknown shader variable type modifier.");
|
|
331 |
+ SkUNREACHABLE; |
|
332 |
} |
|
333 |
||
334 |
void GrShaderVar::setIOType(GrIOType ioType) {
|
|
| 1175 | 335 |
@@ -32,6 +33,7 @@ void GrShaderVar::setIOType(GrIOType ioT |
| 1162 | 336 |
return; |
337 |
} |
|
338 |
SK_ABORT("Unknown io type.");
|
|
339 |
+ SkUNREACHABLE; |
|
340 |
} |
|
341 |
||
342 |
void GrShaderVar::appendDecl(const GrShaderCaps* shaderCaps, SkString* out) const {
|
|
| 1175 | 343 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/SkGpuDevice.cpp |
344 |
=================================================================== |
|
345 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/SkGpuDevice.cpp |
|
346 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/SkGpuDevice.cpp |
|
347 |
@@ -283,6 +283,7 @@ static inline GrPrimitiveType point_mode |
|
| 1162 | 348 |
return GrPrimitiveType::kLineStrip; |
349 |
} |
|
350 |
SK_ABORT("Unexpected mode");
|
|
351 |
+ SkUNREACHABLE; |
|
352 |
} |
|
353 |
||
354 |
void SkGpuDevice::drawPoints(SkCanvas::PointMode mode, |
|
| 1175 | 355 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/SkGr.h |
356 |
=================================================================== |
|
357 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/SkGr.h |
|
358 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/SkGr.h |
|
359 |
@@ -159,6 +159,7 @@ static inline GrPrimitiveType SkVertexMo |
|
| 1162 | 360 |
break; |
361 |
} |
|
362 |
SK_ABORT("Invalid mode");
|
|
363 |
+ SkUNREACHABLE; |
|
364 |
} |
|
365 |
||
366 |
////////////////////////////////////////////////////////////////////////////// |
|
| 1175 | 367 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h |
368 |
=================================================================== |
|
369 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h |
|
370 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h |
|
371 |
@@ -240,6 +240,7 @@ inline const char* GrCCCoverageProcessor |
|
| 1162 | 372 |
case PrimitiveType::kConics: return "kConics"; |
373 |
} |
|
374 |
SK_ABORT("Invalid PrimitiveType");
|
|
375 |
+ SkUNREACHABLE; |
|
376 |
} |
|
377 |
||
378 |
inline void GrCCCoverageProcessor::TriPointInstance::set( |
|
| 1175 | 379 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp |
380 |
=================================================================== |
|
381 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp |
|
382 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp |
|
383 |
@@ -60,6 +60,7 @@ static GrCCStrokeGeometry::Verb join_ver |
|
| 1162 | 384 |
return Verb::kRoundJoin; |
385 |
} |
|
386 |
SK_ABORT("Invalid SkPaint::Join.");
|
|
387 |
+ SkUNREACHABLE; |
|
388 |
} |
|
389 |
||
390 |
void GrCCStrokeGeometry::beginPath(const SkStrokeRec& stroke, float strokeDevWidth, |
|
| 1175 | 391 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h |
392 |
=================================================================== |
|
393 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h |
|
394 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h |
|
395 |
@@ -175,5 +175,6 @@ inline bool GrCCStrokeGeometry::IsIntern |
|
| 1162 | 396 |
return false; |
397 |
} |
|
398 |
SK_ABORT("Invalid GrCCStrokeGeometry::Verb.");
|
|
399 |
+ SkUNREACHABLE; |
|
400 |
} |
|
401 |
#endif |
|
| 1175 | 402 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp |
403 |
=================================================================== |
|
404 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp |
|
405 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp |
|
406 |
@@ -164,6 +164,7 @@ GrPathRenderer::CanDrawPath GrCoverageCo |
|
| 1162 | 407 |
} |
408 |
||
409 |
SK_ABORT("Invalid stroke style.");
|
|
410 |
+ SkUNREACHABLE; |
|
411 |
} |
|
412 |
||
413 |
bool GrCoverageCountingPathRenderer::onDrawPath(const DrawPathArgs& args) {
|
|
| 1175 | 414 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp |
415 |
=================================================================== |
|
416 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp |
|
417 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp |
|
418 |
@@ -550,4 +550,5 @@ GrGLSLPrimitiveProcessor* GrVSCoveragePr |
|
| 1162 | 419 |
return new Impl(std::move(shader), 4); |
420 |
} |
|
421 |
SK_ABORT("Invalid PrimitiveType");
|
|
422 |
+ SkUNREACHABLE; |
|
423 |
} |
|
| 1175 | 424 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp |
425 |
=================================================================== |
|
426 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp |
|
427 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp |
|
428 |
@@ -39,7 +39,9 @@ static dawn::LoadOp to_dawn_load_op(GrLo |
|
| 1162 | 429 |
return dawn::LoadOp::Clear; |
430 |
default: |
|
431 |
SK_ABORT("Invalid LoadOp");
|
|
432 |
+ SkUNREACHABLE; |
|
433 |
} |
|
434 |
+ SkUNREACHABLE; |
|
435 |
} |
|
436 |
||
437 |
GrDawnOpsRenderPass::GrDawnOpsRenderPass(GrDawnGpu* gpu, GrRenderTarget* rt, GrSurfaceOrigin origin, |
|
| 1175 | 438 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp |
439 |
=================================================================== |
|
440 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp |
|
441 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp |
|
442 |
@@ -95,6 +95,7 @@ uint32_t grsltype_to_alignment_mask(GrSL |
|
| 1162 | 443 |
break; |
444 |
} |
|
445 |
SK_ABORT("Unexpected type");
|
|
446 |
+ SkUNREACHABLE; |
|
447 |
} |
|
448 |
||
449 |
static inline uint32_t grsltype_to_size(GrSLType type) {
|
|
| 1175 | 450 |
@@ -173,6 +174,7 @@ static inline uint32_t grsltype_to_size( |
| 1162 | 451 |
break; |
452 |
} |
|
453 |
SK_ABORT("Unexpected type");
|
|
454 |
+ SkUNREACHABLE; |
|
455 |
} |
|
456 |
||
457 |
uint32_t get_ubo_offset(uint32_t* currentOffset, |
|
| 1175 | 458 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp |
459 |
=================================================================== |
|
460 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp |
|
461 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp |
|
462 |
@@ -76,6 +76,7 @@ static inline int grsltype_to_location_s |
|
| 1162 | 463 |
return 0; |
464 |
} |
|
465 |
SK_ABORT("Unexpected type");
|
|
466 |
+ SkUNREACHABLE; |
|
467 |
} |
|
468 |
||
469 |
static void finalize_helper(GrDawnVaryingHandler::VarArray& vars) {
|
|
| 1175 | 470 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp |
471 |
=================================================================== |
|
472 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp |
|
473 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp |
|
474 |
@@ -58,6 +58,7 @@ void main() {
|
|
| 1162 | 475 |
return color * input; |
476 |
} |
|
477 |
SK_ABORT("Unexpected mode");
|
|
478 |
+ SkUNREACHABLE; |
|
479 |
} |
|
480 |
} |
|
481 |
||
| 1175 | 482 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp |
483 |
=================================================================== |
|
484 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp |
|
485 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp |
|
486 |
@@ -204,6 +204,7 @@ const GrXPFactory* GrCoverageSetOpXPFact |
|
| 1162 | 487 |
} |
488 |
#undef _CONSTEXPR_ |
|
489 |
SK_ABORT("Unknown region op.");
|
|
490 |
+ SkUNREACHABLE; |
|
491 |
} |
|
492 |
||
493 |
sk_sp<const GrXferProcessor> GrCoverageSetOpXPFactory::makeXferProcessor( |
|
| 1175 | 494 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp |
495 |
=================================================================== |
|
496 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp |
|
497 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp |
|
498 |
@@ -753,6 +753,7 @@ const GrXPFactory* GrPorterDuffXPFactory |
|
| 1162 | 499 |
return &gScreenPDXPF; |
500 |
default: |
|
501 |
SK_ABORT("Unexpected blend mode.");
|
|
502 |
+ SkUNREACHABLE; |
|
503 |
} |
|
504 |
} |
|
505 |
||
| 1175 | 506 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp |
507 |
=================================================================== |
|
508 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp |
|
509 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp |
|
510 |
@@ -154,6 +154,7 @@ public: |
|
| 1162 | 511 |
} |
512 |
printf("%s\n", SkSL::String(type.fName).c_str());
|
|
513 |
SK_ABORT("unsupported uniform type");
|
|
514 |
+ SkUNREACHABLE; |
|
515 |
} |
|
516 |
||
517 |
void emitCode(EmitArgs& args) override {
|
|
| 1175 | 518 |
@@ -568,6 +569,7 @@ std::unique_ptr<GrFragmentProcessor> GrS |
| 1162 | 519 |
} |
520 |
} |
|
521 |
SK_ABORT("unreachable");
|
|
522 |
+ SkUNREACHABLE; |
|
523 |
} |
|
524 |
||
525 |
#endif |
|
| 1175 | 526 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h |
527 |
=================================================================== |
|
528 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h |
|
529 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h |
|
530 |
@@ -41,6 +41,7 @@ public: |
|
| 1162 | 531 |
return color * input; |
532 |
} |
|
533 |
SK_ABORT("Unexpected mode");
|
|
534 |
+ SkUNREACHABLE; |
|
535 |
} |
|
536 |
static std::unique_ptr<GrFragmentProcessor> Make(SkPMColor4f color, InputMode mode) {
|
|
537 |
return std::unique_ptr<GrFragmentProcessor>(new GrConstColorProcessor(color, mode)); |
|
| 1175 | 538 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/geometry/GrShape.cpp |
539 |
=================================================================== |
|
540 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/geometry/GrShape.cpp |
|
541 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/geometry/GrShape.cpp |
|
542 |
@@ -164,6 +164,7 @@ SkRect GrShape::bounds() const {
|
|
| 1162 | 543 |
return this->path().getBounds(); |
544 |
} |
|
545 |
SK_ABORT("Unknown shape type");
|
|
546 |
+ SkUNREACHABLE; |
|
547 |
} |
|
548 |
||
549 |
SkRect GrShape::styledBounds() const {
|
|
| 1175 | 550 |
@@ -254,6 +255,7 @@ int GrShape::unstyledKeySize() const {
|
| 1162 | 551 |
} |
552 |
} |
|
553 |
SK_ABORT("Should never get here.");
|
|
554 |
+ SkUNREACHABLE; |
|
555 |
} |
|
556 |
||
557 |
void GrShape::writeUnstyledKey(uint32_t* key) const {
|
|
| 1175 | 558 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp |
559 |
=================================================================== |
|
560 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp |
|
561 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp |
|
562 |
@@ -4159,6 +4159,7 @@ GrBackendFormat GrGLCaps::getBackendForm |
|
| 1162 | 563 |
return GrBackendFormat::MakeGL(GR_GL_COMPRESSED_ETC1_RGB8, GR_GL_TEXTURE_2D); |
564 |
} |
|
565 |
SK_ABORT("Invalid compression type");
|
|
566 |
+ SkUNREACHABLE; |
|
567 |
} |
|
568 |
||
569 |
GrSwizzle GrGLCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
|
|
| 1175 | 570 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp |
571 |
=================================================================== |
|
572 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp |
|
573 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp |
|
574 |
@@ -68,4 +68,5 @@ bool GrGLGetGLSLGeneration(const GrGLInt |
|
| 1162 | 575 |
return true; |
576 |
} |
|
577 |
SK_ABORT("Unknown GL Standard");
|
|
578 |
+ SkUNREACHABLE; |
|
579 |
} |
|
| 1175 | 580 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp |
581 |
=================================================================== |
|
582 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp |
|
583 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp |
|
584 |
@@ -196,6 +196,7 @@ static int gl_target_to_binding_index(Gr |
|
| 1162 | 585 |
return 2; |
586 |
} |
|
587 |
SK_ABORT("Unexpected GL texture target.");
|
|
588 |
+ SkUNREACHABLE; |
|
589 |
} |
|
590 |
||
591 |
GrGpuResource::UniqueID GrGLGpu::TextureUnitBindings::boundID(GrGLenum target) const {
|
|
| 1175 | 592 |
@@ -234,6 +235,7 @@ static GrGLenum filter_to_gl_mag_filter( |
| 1162 | 593 |
case GrSamplerState::Filter::kMipMap: return GR_GL_LINEAR; |
594 |
} |
|
595 |
SK_ABORT("Unknown filter");
|
|
596 |
+ SkUNREACHABLE; |
|
597 |
} |
|
598 |
||
599 |
static GrGLenum filter_to_gl_min_filter(GrSamplerState::Filter filter) {
|
|
| 1175 | 600 |
@@ -243,6 +245,7 @@ static GrGLenum filter_to_gl_min_filter( |
| 1162 | 601 |
case GrSamplerState::Filter::kMipMap: return GR_GL_LINEAR_MIPMAP_LINEAR; |
602 |
} |
|
603 |
SK_ABORT("Unknown filter");
|
|
604 |
+ SkUNREACHABLE; |
|
605 |
} |
|
606 |
||
607 |
static inline GrGLenum wrap_mode_to_gl_wrap(GrSamplerState::WrapMode wrapMode, |
|
| 1175 | 608 |
@@ -257,6 +260,7 @@ static inline GrGLenum wrap_mode_to_gl_w |
| 1162 | 609 |
return GR_GL_CLAMP_TO_BORDER; |
610 |
} |
|
611 |
SK_ABORT("Unknown wrap mode");
|
|
612 |
+ SkUNREACHABLE; |
|
613 |
} |
|
614 |
||
615 |
/////////////////////////////////////////////////////////////////////////////// |
|
| 1175 | 616 |
@@ -1107,7 +1111,7 @@ static bool renderbuffer_storage_msaa(co |
| 1162 | 617 |
break; |
618 |
case GrGLCaps::kNone_MSFBOType: |
|
619 |
SK_ABORT("Shouldn't be here if we don't support multisampled renderbuffers.");
|
|
620 |
- break; |
|
621 |
+ SkUNREACHABLE; |
|
622 |
} |
|
623 |
return (GR_GL_NO_ERROR == CHECK_ALLOC_ERROR(ctx.interface())); |
|
624 |
} |
|
| 1175 | 625 |
@@ -2275,9 +2279,10 @@ static GrGLenum gr_primitive_type_to_gl_ |
| 1162 | 626 |
return GR_GL_LINE_STRIP; |
627 |
case GrPrimitiveType::kPath: |
|
628 |
SK_ABORT("non-mesh-based GrPrimitiveType");
|
|
629 |
- return 0; |
|
630 |
+ SkUNREACHABLE; |
|
631 |
} |
|
632 |
SK_ABORT("invalid GrPrimitiveType");
|
|
633 |
+ SkUNREACHABLE; |
|
634 |
} |
|
635 |
||
636 |
void GrGLGpu::sendMeshToGpu(GrPrimitiveType primitiveType, const GrBuffer* vertexBuffer, |
|
| 1175 | 637 |
@@ -4006,7 +4011,8 @@ int GrGLGpu::TextureToCopyProgramIdx(GrT |
| 1162 | 638 |
case kTextureExternalSampler_GrSLType: |
639 |
return 2; |
|
640 |
default: |
|
641 |
- SK_ABORT("Unexpected samper type");
|
|
642 |
+ SK_ABORT("Unexpected sampler type");
|
|
643 |
+ SkUNREACHABLE; |
|
644 |
} |
|
645 |
} |
|
646 |
||
| 1175 | 647 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp |
648 |
=================================================================== |
|
649 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp |
|
650 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp |
|
651 |
@@ -197,6 +197,7 @@ static GrPathRendering::FillType convert |
|
| 1162 | 652 |
switch (fill) {
|
653 |
default: |
|
654 |
SK_ABORT("Incomplete Switch\n");
|
|
655 |
+ SkUNREACHABLE; |
|
656 |
case SkPath::kWinding_FillType: |
|
657 |
case SkPath::kInverseWinding_FillType: |
|
658 |
return GrPathRendering::kWinding_FillType; |
|
| 1175 | 659 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp |
660 |
=================================================================== |
|
661 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp |
|
662 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp |
|
663 |
@@ -25,6 +25,7 @@ GrTextureType GrGLTexture::TextureTypeFr |
|
| 1162 | 664 |
return GrTextureType::kExternal; |
665 |
} |
|
666 |
SK_ABORT("Unexpected texture target");
|
|
667 |
+ SkUNREACHABLE; |
|
668 |
} |
|
669 |
||
670 |
static inline GrGLenum target_from_texture_type(GrTextureType type) {
|
|
| 1175 | 671 |
@@ -37,8 +38,10 @@ static inline GrGLenum target_from_textu |
| 1162 | 672 |
return GR_GL_TEXTURE_EXTERNAL; |
673 |
default: |
|
674 |
SK_ABORT("Unexpected texture target");
|
|
675 |
+ SkUNREACHABLE; |
|
676 |
} |
|
677 |
SK_ABORT("Unexpected texture type");
|
|
678 |
+ SkUNREACHABLE; |
|
679 |
} |
|
680 |
||
681 |
// Because this class is virtually derived from GrSurface we must explicitly call its constructor. |
|
| 1175 | 682 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp |
683 |
=================================================================== |
|
684 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp |
|
685 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp |
|
686 |
@@ -80,6 +80,7 @@ static AttribLayout attrib_layout(GrVert |
|
| 1162 | 687 |
return {true, 4, GR_GL_UNSIGNED_SHORT};
|
688 |
} |
|
689 |
SK_ABORT("Unknown vertex attrib type");
|
|
690 |
+ SkUNREACHABLE; |
|
691 |
}; |
|
692 |
||
693 |
void GrGLAttribArrayState::set(GrGLGpu* gpu, |
|
| 1175 | 694 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp |
695 |
=================================================================== |
|
696 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp |
|
697 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp |
|
698 |
@@ -98,4 +98,5 @@ const char* GrGLSLTypeString(GrSLType t) |
|
| 1162 | 699 |
return "sampler"; |
700 |
} |
|
701 |
SK_ABORT("Unknown shader var type.");
|
|
702 |
+ SkUNREACHABLE; |
|
703 |
} |
|
| 1175 | 704 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp |
705 |
=================================================================== |
|
706 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp |
|
707 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp |
|
708 |
@@ -35,6 +35,7 @@ static bool use_flat_interpolation(GrGLS |
|
| 1162 | 709 |
return true; |
710 |
} |
|
711 |
SK_ABORT("Invalid interpolation");
|
|
712 |
+ SkUNREACHABLE; |
|
713 |
} |
|
714 |
||
715 |
void GrGLSLVaryingHandler::addVarying(const char* name, GrGLSLVarying* varying, |
|
| 1175 | 716 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp |
717 |
=================================================================== |
|
718 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp |
|
719 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp |
|
720 |
@@ -51,6 +51,7 @@ static const char* input_type_name(GrGLS |
|
| 1162 | 721 |
case InputType::kTriangles: return "triangles"; |
722 |
} |
|
723 |
SK_ABORT("invalid input type");
|
|
724 |
+ SkUNREACHABLE; |
|
725 |
} |
|
726 |
||
727 |
static const char* output_type_name(GrGLSLGeometryBuilder::OutputType out) {
|
|
| 1175 | 728 |
@@ -61,6 +62,7 @@ static const char* output_type_name(GrGL |
| 1162 | 729 |
case OutputType::kTriangleStrip: return "triangle_strip"; |
730 |
} |
|
731 |
SK_ABORT("invalid output type");
|
|
732 |
+ SkUNREACHABLE; |
|
733 |
} |
|
734 |
||
735 |
void GrGLSLGeometryBuilder::configure(InputType inputType, OutputType outputType, int maxVertices, |
|
| 1175 | 736 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm |
737 |
=================================================================== |
|
738 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm |
|
739 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm |
|
740 |
@@ -506,6 +506,7 @@ size_t GrMtlCaps::GetFormatIndex(MTLPixe |
|
| 1162 | 741 |
} |
742 |
} |
|
743 |
SK_ABORT("Invalid MTLPixelFormat");
|
|
744 |
+ SkUNREACHABLE; |
|
745 |
} |
|
746 |
||
747 |
void GrMtlCaps::initFormatTable() {
|
|
| 1175 | 748 |
@@ -1011,6 +1012,7 @@ GrBackendFormat GrMtlCaps::getBackendFor |
| 1162 | 749 |
#endif |
750 |
} |
|
751 |
SK_ABORT("Invalid compression type");
|
|
752 |
+ SkUNREACHABLE; |
|
753 |
} |
|
754 |
||
755 |
GrSwizzle GrMtlCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
|
|
| 1175 | 756 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm |
757 |
=================================================================== |
|
758 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm |
|
759 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm |
|
760 |
@@ -155,6 +155,7 @@ static inline MTLVertexFormat attribute_ |
|
| 1162 | 761 |
return MTLVertexFormatUShort4Normalized; |
762 |
} |
|
763 |
SK_ABORT("Unknown vertex attribute type");
|
|
764 |
+ SkUNREACHABLE; |
|
765 |
} |
|
766 |
||
767 |
static MTLVertexDescriptor* create_vertex_descriptor(const GrPrimitiveProcessor& primProc) {
|
|
| 1175 | 768 |
@@ -276,6 +277,7 @@ static MTLBlendFactor blend_coeff_to_mtl |
| 1162 | 769 |
} |
770 |
||
771 |
SK_ABORT("Unknown blend coefficient");
|
|
772 |
+ SkUNREACHABLE; |
|
773 |
} |
|
774 |
||
775 |
static MTLBlendOperation blend_equation_to_mtl_blend_op(GrBlendEquation equation) {
|
|
| 1175 | 776 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm |
777 |
=================================================================== |
|
778 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm |
|
779 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm |
|
780 |
@@ -38,6 +38,7 @@ static inline MTLSamplerAddressMode wrap |
|
| 1162 | 781 |
} |
782 |
} |
|
783 |
SK_ABORT("Unknown wrap mode.");
|
|
784 |
+ SkUNREACHABLE; |
|
785 |
} |
|
786 |
||
787 |
GrMtlSampler* GrMtlSampler::Create(const GrMtlGpu* gpu, const GrSamplerState& samplerState) {
|
|
| 1175 | 788 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm |
789 |
=================================================================== |
|
790 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm |
|
791 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm |
|
792 |
@@ -90,6 +90,7 @@ static uint32_t grsltype_to_alignment_ma |
|
| 1162 | 793 |
break; |
794 |
} |
|
795 |
SK_ABORT("Unexpected type");
|
|
796 |
+ SkUNREACHABLE; |
|
797 |
} |
|
798 |
||
799 |
/** Returns the size in bytes taken up in Metal buffers for GrSLTypes. */ |
|
| 1175 | 800 |
@@ -172,6 +173,7 @@ static inline uint32_t grsltype_to_mtl_s |
| 1162 | 801 |
break; |
802 |
} |
|
803 |
SK_ABORT("Unexpected type");
|
|
804 |
+ SkUNREACHABLE; |
|
805 |
} |
|
806 |
||
807 |
// Given the current offset into the ubo, calculate the offset for the uniform we're trying to add |
|
| 1175 | 808 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm |
809 |
=================================================================== |
|
810 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm |
|
811 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm |
|
812 |
@@ -112,6 +112,7 @@ bool GrPixelConfigToMTLFormat(GrPixelCon |
|
| 1162 | 813 |
return true; |
814 |
} |
|
815 |
SK_ABORT("Unexpected config");
|
|
816 |
+ SkUNREACHABLE; |
|
817 |
} |
|
818 |
||
819 |
MTLTextureDescriptor* GrGetMTLTextureDescriptor(id<MTLTexture> mtlTexture) {
|
|
| 1175 | 820 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp |
821 |
=================================================================== |
|
822 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp |
|
823 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp |
|
824 |
@@ -610,6 +610,7 @@ static uint32_t seed_vertices(GrPrimitiv |
|
| 1162 | 825 |
return 0; |
826 |
} |
|
827 |
SK_ABORT("Incomplete switch\n");
|
|
828 |
+ SkUNREACHABLE; |
|
829 |
} |
|
830 |
||
831 |
static uint32_t primitive_vertices(GrPrimitiveType type) {
|
|
| 1175 | 832 |
@@ -627,6 +628,7 @@ static uint32_t primitive_vertices(GrPri |
| 1162 | 833 |
return 0; |
834 |
} |
|
835 |
SK_ABORT("Incomplete switch\n");
|
|
836 |
+ SkUNREACHABLE; |
|
837 |
} |
|
838 |
||
839 |
static SkPoint random_point(SkRandom* random, SkScalar min, SkScalar max) {
|
|
| 1175 | 840 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp |
841 |
=================================================================== |
|
842 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp |
|
843 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp |
|
844 |
@@ -823,4 +823,5 @@ static bool can_use_hw_derivatives_with_ |
|
| 1162 | 845 |
} |
846 |
} |
|
847 |
SK_ABORT("Invalid round rect type.");
|
|
848 |
+ SkUNREACHABLE; |
|
849 |
} |
|
| 1175 | 850 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp |
851 |
=================================================================== |
|
852 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp |
|
853 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp |
|
854 |
@@ -2283,6 +2283,7 @@ static int rrect_type_to_vert_count(RRec |
|
| 1162 | 855 |
return kVertsPerOverstrokeRRect; |
856 |
} |
|
857 |
SK_ABORT("Invalid type");
|
|
858 |
+ SkUNREACHABLE; |
|
859 |
} |
|
860 |
||
861 |
static int rrect_type_to_index_count(RRectType type) {
|
|
| 1175 | 862 |
@@ -2295,6 +2296,7 @@ static int rrect_type_to_index_count(RRe |
| 1162 | 863 |
return kIndicesPerOverstrokeRRect; |
864 |
} |
|
865 |
SK_ABORT("Invalid type");
|
|
866 |
+ SkUNREACHABLE; |
|
867 |
} |
|
868 |
||
869 |
static const uint16_t* rrect_type_to_indices(RRectType type) {
|
|
| 1175 | 870 |
@@ -2306,6 +2308,7 @@ static const uint16_t* rrect_type_to_ind |
871 |
return gOverstrokeRRectIndices; |
|
872 |
} |
|
873 |
SK_ABORT("Invalid type");
|
|
874 |
+ SkUNREACHABLE; |
|
875 |
} |
|
876 |
||
877 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
878 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp |
|
879 |
=================================================================== |
|
880 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp |
|
881 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp |
|
882 |
@@ -155,6 +155,7 @@ static int rrect_type_to_vert_count(RRec |
|
883 |
return kVertsPerOverstrokeRRect; |
|
884 |
} |
|
885 |
SK_ABORT("Invalid type");
|
|
886 |
+ SkUNREACHABLE; |
|
887 |
} |
|
888 |
||
889 |
static int rrect_type_to_index_count(RRectType type) {
|
|
890 |
@@ -167,6 +168,7 @@ static int rrect_type_to_index_count(RRe |
|
891 |
return kIndicesPerOverstrokeRRect; |
|
892 |
} |
|
893 |
SK_ABORT("Invalid type");
|
|
894 |
+ SkUNREACHABLE; |
|
895 |
} |
|
896 |
||
897 |
static const uint16_t* rrect_type_to_indices(RRectType type) {
|
|
898 |
@@ -178,6 +180,7 @@ static const uint16_t* rrect_type_to_ind |
|
| 1162 | 899 |
return gRRectIndices; |
900 |
} |
|
901 |
SK_ABORT("Invalid type");
|
|
902 |
+ SkUNREACHABLE; |
|
903 |
} |
|
904 |
||
905 |
/////////////////////////////////////////////////////////////////////////////// |
|
| 1175 | 906 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/text/GrTextBlob.h |
907 |
=================================================================== |
|
908 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/text/GrTextBlob.h |
|
909 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/text/GrTextBlob.h |
|
910 |
@@ -125,6 +125,7 @@ public: |
|
| 1162 | 911 |
|
912 |
void* operator new(size_t) {
|
|
913 |
SK_ABORT("All blobs are created by placement new.");
|
|
914 |
+ SkUNREACHABLE; |
|
915 |
} |
|
916 |
||
917 |
void* operator new(size_t, void* p) { return p; }
|
|
| 1175 | 918 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp |
919 |
=================================================================== |
|
920 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp |
|
921 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp |
|
922 |
@@ -284,4 +284,5 @@ bool GrTextBlob::VertexRegenerator::rege |
|
| 1162 | 923 |
return true; |
924 |
} |
|
925 |
SK_ABORT("Should not get here");
|
|
926 |
+ SkUNREACHABLE; |
|
927 |
} |
|
| 1175 | 928 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp |
929 |
=================================================================== |
|
930 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp |
|
931 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp |
|
932 |
@@ -108,6 +108,7 @@ static FormatCompatibilityClass format_c |
|
| 1162 | 933 |
|
934 |
default: |
|
935 |
SK_ABORT("Unsupported VkFormat");
|
|
936 |
+ SkUNREACHABLE; |
|
937 |
} |
|
938 |
} |
|
939 |
||
| 1175 | 940 |
@@ -1656,6 +1657,7 @@ GrBackendFormat GrVkCaps::getBackendForm |
| 1162 | 941 |
return GrBackendFormat::MakeVk(VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK); |
942 |
} |
|
943 |
SK_ABORT("Invalid compression type");
|
|
944 |
+ SkUNREACHABLE; |
|
945 |
} |
|
946 |
||
947 |
GrSwizzle GrVkCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
|
|
| 1175 | 948 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp |
949 |
=================================================================== |
|
950 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp |
|
951 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp |
|
952 |
@@ -28,6 +28,7 @@ static BufferUsage get_buffer_usage(GrVk |
|
| 1162 | 953 |
return BufferUsage::kCpuOnly; |
954 |
} |
|
955 |
SK_ABORT("Invalid GrVkBuffer::Type");
|
|
956 |
+ SkUNREACHABLE; |
|
957 |
} |
|
958 |
||
959 |
bool GrVkMemory::AllocAndBindBufferMemory(const GrVkGpu* gpu, |
|
| 1175 | 960 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp |
961 |
=================================================================== |
|
962 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp |
|
963 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp |
|
964 |
@@ -80,6 +80,7 @@ static inline VkFormat attrib_type_to_vk |
|
| 1162 | 965 |
return VK_FORMAT_R16G16B16A16_UNORM; |
966 |
} |
|
967 |
SK_ABORT("Unknown vertex attrib type");
|
|
968 |
+ SkUNREACHABLE; |
|
969 |
} |
|
970 |
||
971 |
static void setup_vertex_input_state(const GrPrimitiveProcessor& primProc, |
|
| 1175 | 972 |
@@ -162,8 +163,10 @@ static VkPrimitiveTopology gr_primitive_ |
| 1162 | 973 |
return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP; |
974 |
case GrPrimitiveType::kPath: |
|
975 |
SK_ABORT("Unsupported primitive type");
|
|
976 |
+ SkUNREACHABLE; |
|
977 |
} |
|
978 |
SK_ABORT("invalid GrPrimitiveType");
|
|
979 |
+ SkUNREACHABLE; |
|
980 |
} |
|
981 |
||
982 |
static void setup_input_assembly_state(GrPrimitiveType primitiveType, |
|
| 1175 | 983 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp |
984 |
=================================================================== |
|
985 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp |
|
986 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp |
|
987 |
@@ -23,6 +23,7 @@ static inline VkSamplerAddressMode wrap_ |
|
| 1162 | 988 |
return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; |
989 |
} |
|
990 |
SK_ABORT("Unknown wrap mode.");
|
|
991 |
+ SkUNREACHABLE; |
|
992 |
} |
|
993 |
||
994 |
GrVkSampler* GrVkSampler::Create(GrVkGpu* gpu, const GrSamplerState& samplerState, |
|
| 1175 | 995 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h |
996 |
=================================================================== |
|
997 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h |
|
998 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h |
|
999 |
@@ -34,6 +34,7 @@ private: |
|
| 1162 | 1000 |
|
1001 |
bool onUpdateData(const void* src, size_t srcSizeInBytes) override {
|
|
1002 |
SK_ABORT("Not implemented for transfer buffers.");
|
|
1003 |
+ SkUNREACHABLE; |
|
1004 |
} |
|
1005 |
||
1006 |
GrVkGpu* getVkGpu() const {
|
|
| 1175 | 1007 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp |
1008 |
=================================================================== |
|
1009 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp |
|
1010 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp |
|
1011 |
@@ -89,6 +89,7 @@ static uint32_t grsltype_to_alignment_ma |
|
| 1162 | 1012 |
break; |
1013 |
} |
|
1014 |
SK_ABORT("Unexpected type");
|
|
1015 |
+ SkUNREACHABLE; |
|
1016 |
} |
|
1017 |
||
1018 |
/** Returns the size in bytes taken up in vulkanbuffers for GrSLTypes. */ |
|
| 1175 | 1019 |
@@ -172,6 +173,7 @@ static inline uint32_t grsltype_to_vk_si |
| 1162 | 1020 |
break; |
1021 |
} |
|
1022 |
SK_ABORT("Unexpected type");
|
|
1023 |
+ SkUNREACHABLE; |
|
1024 |
} |
|
1025 |
||
1026 |
||
| 1175 | 1027 |
Index: firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp |
1028 |
=================================================================== |
|
1029 |
--- firefox-102.0.orig/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp |
|
1030 |
+++ firefox-102.0/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp |
|
1031 |
@@ -74,6 +74,7 @@ static inline int grsltype_to_location_s |
|
| 1162 | 1032 |
return 1; |
1033 |
} |
|
1034 |
SK_ABORT("Unexpected type");
|
|
1035 |
+ SkUNREACHABLE; |
|
1036 |
} |
|
1037 |
||
1038 |
static void finalize_helper(GrVkVaryingHandler::VarArray& vars) {
|
|
| 1175 | 1039 |
Index: firefox-102.0/gfx/skia/skia/src/pdf/SkPDFTag.cpp |
1040 |
=================================================================== |
|
1041 |
--- firefox-102.0.orig/gfx/skia/skia/src/pdf/SkPDFTag.cpp |
|
1042 |
+++ firefox-102.0/gfx/skia/skia/src/pdf/SkPDFTag.cpp |
|
1043 |
@@ -64,6 +64,7 @@ static const char* tag_name_from_type(Sk |
|
| 1162 | 1044 |
#undef M |
1045 |
} |
|
1046 |
SK_ABORT("bad tag");
|
|
1047 |
+ SkUNREACHABLE; |
|
1048 |
} |
|
1049 |
||
1050 |
struct SkPDFTagNode {
|
|
| 1175 | 1051 |
Index: firefox-102.0/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp |
1052 |
=================================================================== |
|
1053 |
--- firefox-102.0.orig/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp |
|
1054 |
+++ firefox-102.0/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp |
|
1055 |
@@ -173,18 +173,22 @@ public: |
|
| 1162 | 1056 |
protected: |
1057 |
int onCountFamilies() const override {
|
|
1058 |
SK_ABORT("Not implemented.");
|
|
1059 |
+ SkUNREACHABLE; |
|
1060 |
} |
|
1061 |
||
1062 |
void onGetFamilyName(int index, SkString* familyName) const override {
|
|
1063 |
SK_ABORT("Not implemented.");
|
|
1064 |
+ SkUNREACHABLE; |
|
1065 |
} |
|
1066 |
||
1067 |
SkFontStyleSet* onCreateStyleSet(int index) const override {
|
|
1068 |
SK_ABORT("Not implemented.");
|
|
1069 |
+ SkUNREACHABLE; |
|
1070 |
} |
|
1071 |
||
1072 |
SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
|
|
1073 |
SK_ABORT("Not implemented.");
|
|
1074 |
+ SkUNREACHABLE; |
|
1075 |
} |
|
1076 |
||
1077 |
SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[], |
|
| 1175 | 1078 |
@@ -215,10 +219,12 @@ protected: |
| 1162 | 1079 |
const char* bcp47[], int bcp47Count, |
1080 |
SkUnichar character) const override {
|
|
1081 |
SK_ABORT("Not implemented.");
|
|
1082 |
+ SkUNREACHABLE; |
|
1083 |
} |
|
1084 |
||
1085 |
SkTypeface* onMatchFaceStyle(const SkTypeface*, const SkFontStyle&) const override {
|
|
1086 |
SK_ABORT("Not implemented.");
|
|
1087 |
+ SkUNREACHABLE; |
|
1088 |
} |
|
1089 |
||
1090 |
sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData> data, int ttcIndex) const override {
|
|
| 1175 | 1091 |
Index: firefox-102.0/gfx/skia/skia/src/shaders/SkImageShader.cpp |
1092 |
=================================================================== |
|
1093 |
--- firefox-102.0.orig/gfx/skia/skia/src/shaders/SkImageShader.cpp |
|
1094 |
+++ firefox-102.0/gfx/skia/skia/src/shaders/SkImageShader.cpp |
|
1095 |
@@ -183,6 +183,7 @@ static GrSamplerState::WrapMode tile_mod |
|
| 1162 | 1096 |
return GrSamplerState::WrapMode::kClampToBorder; |
1097 |
} |
|
1098 |
SK_ABORT("Unknown tile mode.");
|
|
1099 |
+ SkUNREACHABLE; |
|
1100 |
} |
|
1101 |
||
1102 |
std::unique_ptr<GrFragmentProcessor> SkImageShader::asFragmentProcessor( |
|
| 1175 | 1103 |
Index: firefox-102.0/gfx/skia/skia/src/utils/SkShadowUtils.cpp |
1104 |
=================================================================== |
|
1105 |
--- firefox-102.0.orig/gfx/skia/skia/src/utils/SkShadowUtils.cpp |
|
1106 |
+++ firefox-102.0/gfx/skia/skia/src/utils/SkShadowUtils.cpp |
|
1107 |
@@ -149,6 +149,7 @@ struct SpotVerticesFactory {
|
|
| 1162 | 1108 |
return false; |
1109 |
} |
|
1110 |
SK_ABORT("Uninitialized occluder type?");
|
|
1111 |
+ SkUNREACHABLE; |
|
1112 |
} |
|
1113 |
||
1114 |
sk_sp<SkVertices> makeVertices(const SkPath& path, const SkMatrix& ctm, |
|
| 1175 | 1115 |
Index: firefox-102.0/intl/icu/source/i18n/number_rounding.cpp |
1116 |
=================================================================== |
|
1117 |
--- firefox-102.0.orig/intl/icu/source/i18n/number_rounding.cpp |
|
1118 |
+++ firefox-102.0/intl/icu/source/i18n/number_rounding.cpp |
|
1119 |
@@ -283,6 +283,7 @@ FractionPrecision Precision::constructFr |
|
1120 |
settings.fMaxFrac = static_cast<digits_t>(maxFrac); |
|
1121 |
settings.fMinSig = -1; |
|
1122 |
settings.fMaxSig = -1; |
|
1123 |
+ settings.fPriority = UNUM_ROUNDING_PRIORITY_RELAXED; |
|
1124 |
PrecisionUnion union_; |
|
1125 |
union_.fracSig = settings; |
|
1126 |
return {RND_FRACTION, union_};
|
|
1127 |
@@ -294,6 +295,7 @@ Precision Precision::constructSignifican |
|
1128 |
settings.fMaxFrac = -1; |
|
1129 |
settings.fMinSig = static_cast<digits_t>(minSig); |
|
1130 |
settings.fMaxSig = static_cast<digits_t>(maxSig); |
|
1131 |
+ settings.fPriority = UNUM_ROUNDING_PRIORITY_RELAXED; |
|
1132 |
PrecisionUnion union_; |
|
1133 |
union_.fracSig = settings; |
|
1134 |
return {RND_SIGNIFICANT, union_};
|
|
1135 |
Index: firefox-102.0/third_party/libwebrtc/api/adaptation/resource.cc |
|
1136 |
=================================================================== |
|
1137 |
--- firefox-102.0.orig/third_party/libwebrtc/api/adaptation/resource.cc |
|
1138 |
+++ firefox-102.0/third_party/libwebrtc/api/adaptation/resource.cc |
|
1139 |
@@ -9,6 +9,7 @@ |
|
1140 |
*/ |
|
1141 |
||
1142 |
#include "api/adaptation/resource.h" |
|
1143 |
+#include "rtc_base/checks.h" |
|
1144 |
||
1145 |
namespace webrtc {
|
|
1146 |
||
1147 |
@@ -18,6 +19,9 @@ const char* ResourceUsageStateToString(R |
|
1148 |
return "kOveruse"; |
|
1149 |
case ResourceUsageState::kUnderuse: |
|
1150 |
return "kUnderuse"; |
|
1151 |
+ default: |
|
1152 |
+ RTC_NOTREACHED(); |
|
1153 |
+ return ""; |
|
1154 |
} |
|
1155 |
} |
|
1156 |
||
1157 |
Index: firefox-102.0/third_party/libwebrtc/api/rtp_parameters.cc |
|
1158 |
=================================================================== |
|
1159 |
--- firefox-102.0.orig/third_party/libwebrtc/api/rtp_parameters.cc |
|
1160 |
+++ firefox-102.0/third_party/libwebrtc/api/rtp_parameters.cc |
|
1161 |
@@ -29,6 +29,9 @@ const char* DegradationPreferenceToStrin |
|
1162 |
return "maintain-resolution"; |
|
1163 |
case DegradationPreference::BALANCED: |
|
1164 |
return "balanced"; |
|
1165 |
+ default: |
|
1166 |
+ RTC_NOTREACHED(); |
|
1167 |
+ return ""; |
|
1168 |
} |
|
1169 |
} |
|
1170 |
||
1171 |
Index: firefox-102.0/third_party/libwebrtc/api/video_codecs/video_codec.cc |
|
1172 |
=================================================================== |
|
1173 |
--- firefox-102.0.orig/third_party/libwebrtc/api/video_codecs/video_codec.cc |
|
1174 |
+++ firefox-102.0/third_party/libwebrtc/api/video_codecs/video_codec.cc |
|
1175 |
@@ -119,6 +119,9 @@ const char* CodecTypeToPayloadString(Vid |
|
1176 |
return kPayloadNameMultiplex; |
|
1177 |
case kVideoCodecGeneric: |
|
1178 |
return kPayloadNameGeneric; |
|
1179 |
+ default: |
|
1180 |
+ RTC_NOTREACHED(); |
|
1181 |
+ return ""; |
|
1182 |
} |
|
1183 |
} |
|
1184 |
||
1185 |
Index: firefox-102.0/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc |
|
1186 |
=================================================================== |
|
1187 |
--- firefox-102.0.orig/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc |
|
1188 |
+++ firefox-102.0/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc |
|
1189 |
@@ -161,6 +161,9 @@ class VideoEncoderSoftwareFallbackWrappe |
|
1190 |
case EncoderState::kFallbackDueToFailure: |
|
1191 |
case EncoderState::kForcedFallback: |
|
1192 |
return fallback_encoder_.get(); |
|
1193 |
+ default: |
|
1194 |
+ RTC_NOTREACHED(); |
|
1195 |
+ return nullptr; |
|
1196 |
} |
|
1197 |
} |
|
1198 |
||
1199 |
@@ -339,6 +342,9 @@ int32_t VideoEncoderSoftwareFallbackWrap |
|
1200 |
case EncoderState::kFallbackDueToFailure: |
|
1201 |
case EncoderState::kForcedFallback: |
|
1202 |
return fallback_encoder_->Encode(frame, frame_types); |
|
1203 |
+ default: |
|
1204 |
+ RTC_NOTREACHED(); |
|
1205 |
+ return WEBRTC_VIDEO_CODEC_ERROR; |
|
1206 |
} |
|
1207 |
} |
|
1208 |
int32_t VideoEncoderSoftwareFallbackWrapper::EncodeWithMainEncoder( |
|
1209 |
Index: firefox-102.0/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc |
|
1210 |
=================================================================== |
|
1211 |
--- firefox-102.0.orig/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc |
|
1212 |
+++ firefox-102.0/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc |
|
1213 |
@@ -161,6 +161,9 @@ const char* Adaptation::StatusToString(A |
|
1214 |
return "kAdaptationDisabled"; |
|
1215 |
case Status::kRejectedByConstraint: |
|
1216 |
return "kRejectedByConstraint"; |
|
1217 |
+ default: |
|
1218 |
+ RTC_NOTREACHED(); |
|
1219 |
+ return ""; |
|
1220 |
} |
|
1221 |
} |
|
1222 |
||
1223 |
@@ -380,6 +383,9 @@ VideoStreamAdapter::RestrictionsOrState |
|
1224 |
} |
|
1225 |
case DegradationPreference::DISABLED: |
|
1226 |
return Adaptation::Status::kAdaptationDisabled; |
|
1227 |
+ default: |
|
1228 |
+ RTC_NOTREACHED(); |
|
1229 |
+ return Adaptation::Status::kAdaptationDisabled; |
|
1230 |
} |
|
1231 |
} |
|
1232 |
||
1233 |
@@ -459,6 +465,9 @@ VideoStreamAdapter::GetAdaptationDownSte |
|
1234 |
} |
|
1235 |
case DegradationPreference::DISABLED: |
|
1236 |
return Adaptation::Status::kAdaptationDisabled; |
|
1237 |
+ default: |
|
1238 |
+ RTC_NOTREACHED(); |
|
1239 |
+ return Adaptation::Status::kAdaptationDisabled; |
|
1240 |
} |
|
1241 |
} |
|
1242 |
||
1243 |
@@ -599,6 +608,8 @@ Adaptation VideoStreamAdapter::GetAdaptD |
|
1244 |
} |
|
1245 |
default: |
|
1246 |
RTC_NOTREACHED(); |
|
1247 |
+ return RestrictionsOrStateToAdaptation( |
|
1248 |
+ Adaptation::Status::kAdaptationDisabled, input_state); |
|
1249 |
} |
|
1250 |
} |
|
1251 |
||
1252 |
Index: firefox-102.0/third_party/libwebrtc/call/simulated_network.cc |
|
1253 |
=================================================================== |
|
1254 |
--- firefox-102.0.orig/third_party/libwebrtc/call/simulated_network.cc |
|
1255 |
+++ firefox-102.0/third_party/libwebrtc/call/simulated_network.cc |
|
1256 |
@@ -77,6 +77,8 @@ bool CoDelSimulation::DropDequeuedPacket |
|
1257 |
} |
|
1258 |
return false; |
|
1259 |
} |
|
1260 |
+ RTC_NOTREACHED(); |
|
1261 |
+ return false; |
|
1262 |
} |
|
1263 |
||
1264 |
SimulatedNetwork::SimulatedNetwork(Config config, uint64_t random_seed) |
|
1265 |
Index: firefox-102.0/third_party/libwebrtc/call/video_send_stream.cc |
|
1266 |
=================================================================== |
|
1267 |
--- firefox-102.0.orig/third_party/libwebrtc/call/video_send_stream.cc |
|
1268 |
+++ firefox-102.0/third_party/libwebrtc/call/video_send_stream.cc |
|
1269 |
@@ -27,6 +27,9 @@ const char* StreamTypeToString(VideoSend |
|
1270 |
return "rtx"; |
|
1271 |
case VideoSendStream::StreamStats::StreamType::kFlexfec: |
|
1272 |
return "flexfec"; |
|
1273 |
+ default: |
|
1274 |
+ RTC_NOTREACHED(); |
|
1275 |
+ return ""; |
|
1276 |
} |
|
1277 |
} |
|
1278 |
||
1279 |
Index: firefox-102.0/third_party/libwebrtc/modules/audio_coding/neteq/decision_logic.cc |
|
1280 |
=================================================================== |
|
1281 |
--- firefox-102.0.orig/third_party/libwebrtc/modules/audio_coding/neteq/decision_logic.cc |
|
1282 |
+++ firefox-102.0/third_party/libwebrtc/modules/audio_coding/neteq/decision_logic.cc |
|
1283 |
@@ -352,7 +352,7 @@ NetEq::Operation DecisionLogic::FuturePa |
|
1284 |
prev_mode == NetEq::Mode::kCodecInternalCng) {
|
|
1285 |
size_t cur_size_samples = |
|
1286 |
estimate_dtx_delay_ |
|
1287 |
- ? cur_size_samples = span_samples_in_packet_buffer |
|
1288 |
+ ? span_samples_in_packet_buffer |
|
1289 |
: num_packets_in_packet_buffer * decoder_frame_length; |
|
1290 |
// Target level is in number of packets in Q8. |
|
1291 |
const size_t target_level_samples = |
|
1292 |
Index: firefox-102.0/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc |
|
1293 |
=================================================================== |
|
1294 |
--- firefox-102.0.orig/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc |
|
1295 |
+++ firefox-102.0/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc |
|
1296 |
@@ -113,6 +113,9 @@ GainControl::Mode Agc1ConfigModeToInterf |
|
1297 |
return GainControl::kAdaptiveDigital; |
|
1298 |
case Agc1Config::kFixedDigital: |
|
1299 |
return GainControl::kFixedDigital; |
|
1300 |
+ default: |
|
1301 |
+ RTC_NOTREACHED(); |
|
1302 |
+ return GainControl::kAdaptiveAnalog; |
|
1303 |
} |
|
1304 |
} |
|
1305 |
||
1306 |
@@ -1852,6 +1855,7 @@ void AudioProcessingImpl::InitializeNois |
|
1307 |
return NsConfig::SuppressionLevel::k21dB; |
|
1308 |
default: |
|
1309 |
RTC_NOTREACHED(); |
|
1310 |
+ return NsConfig::SuppressionLevel::k6dB; |
|
1311 |
} |
|
1312 |
}; |
|
1313 |
||
1314 |
Index: firefox-102.0/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc |
|
1315 |
=================================================================== |
|
1316 |
--- firefox-102.0.orig/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc |
|
1317 |
+++ firefox-102.0/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc |
|
1318 |
@@ -27,6 +27,9 @@ std::string NoiseSuppressionLevelToStrin |
|
1319 |
return "High"; |
|
1320 |
case AudioProcessing::Config::NoiseSuppression::Level::kVeryHigh: |
|
1321 |
return "VeryHigh"; |
|
1322 |
+ default: |
|
1323 |
+ RTC_NOTREACHED(); |
|
1324 |
+ return ""; |
|
1325 |
} |
|
1326 |
} |
|
1327 |
||
1328 |
@@ -39,6 +42,9 @@ std::string GainController1ModeToString( |
|
1329 |
return "AdaptiveDigital"; |
|
1330 |
case AudioProcessing::Config::GainController1::Mode::kFixedDigital: |
|
1331 |
return "FixedDigital"; |
|
1332 |
+ default: |
|
1333 |
+ RTC_NOTREACHED(); |
|
1334 |
+ return ""; |
|
1335 |
} |
|
1336 |
} |
|
1337 |
||
1338 |
@@ -49,6 +55,9 @@ std::string GainController2LevelEstimato |
|
1339 |
return "Rms"; |
|
1340 |
case AudioProcessing::Config::GainController2::LevelEstimator::kPeak: |
|
1341 |
return "Peak"; |
|
1342 |
+ default: |
|
1343 |
+ RTC_NOTREACHED(); |
|
1344 |
+ return ""; |
|
1345 |
} |
|
1346 |
} |
|
1347 |
||
1348 |
Index: firefox-102.0/third_party/libwebrtc/modules/pacing/pacing_controller.cc |
|
1349 |
=================================================================== |
|
1350 |
--- firefox-102.0.orig/third_party/libwebrtc/modules/pacing/pacing_controller.cc |
|
1351 |
+++ firefox-102.0/third_party/libwebrtc/modules/pacing/pacing_controller.cc |
|
1352 |
@@ -83,6 +83,9 @@ int GetPriorityForType(RtpPacketMediaTyp |
|
1353 |
// Packets that are in themselves likely useless, only sent to keep the |
|
1354 |
// BWE high. |
|
1355 |
return kFirstPriority + 4; |
|
1356 |
+ default: |
|
1357 |
+ RTC_NOTREACHED(); |
|
1358 |
+ return -1; |
|
1359 |
} |
|
1360 |
} |
|
1361 |
||
1362 |
Index: firefox-102.0/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
|
1363 |
=================================================================== |
|
1364 |
--- firefox-102.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
|
1365 |
+++ firefox-102.0/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
|
1366 |
@@ -36,6 +36,9 @@ std::unique_ptr<VideoRtpDepacketizer> Cr |
|
1367 |
case kVideoCodecGeneric: |
|
1368 |
case kVideoCodecMultiplex: |
|
1369 |
return std::make_unique<VideoRtpDepacketizerGeneric>(); |
|
1370 |
+ default: |
|
1371 |
+ RTC_NOTREACHED(); |
|
1372 |
+ return nullptr; |
|
1373 |
} |
|
1374 |
} |
|
1375 |
||
1376 |
Index: firefox-102.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
|
1377 |
=================================================================== |
|
1378 |
--- firefox-102.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
|
1379 |
+++ firefox-102.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
|
1380 |
@@ -130,6 +130,9 @@ bool IsNonVolatile(RTPExtensionType type |
|
1381 |
// TODO: Mozilla implement for CsrcAudioLevel |
|
1382 |
RTC_CHECK(false); |
|
1383 |
return false; |
|
1384 |
+ default: |
|
1385 |
+ RTC_NOTREACHED(); |
|
1386 |
+ return false; |
|
1387 |
} |
|
1388 |
} |
|
1389 |
||
1390 |
Index: firefox-102.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
|
1391 |
=================================================================== |
|
1392 |
--- firefox-102.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
|
1393 |
+++ firefox-102.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
|
1394 |
@@ -45,6 +45,9 @@ const char* FrameTypeToString(AudioFrame |
|
1395 |
return "audio_speech"; |
|
1396 |
case AudioFrameType::kAudioFrameCN: |
|
1397 |
return "audio_cn"; |
|
1398 |
+ default: |
|
1399 |
+ RTC_NOTREACHED(); |
|
1400 |
+ return ""; |
|
1401 |
} |
|
1402 |
} |
|
1403 |
#endif |
|
1404 |
Index: firefox-102.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc |
|
1405 |
=================================================================== |
|
1406 |
--- firefox-102.0.orig/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc |
|
1407 |
+++ firefox-102.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc |
|
1408 |
@@ -28,6 +28,9 @@ TemporalLayersChecker::CreateTemporalLay |
|
1409 |
case Vp8TemporalLayersType::kBitrateDynamic: |
|
1410 |
// Conference mode temporal layering for screen content in base stream. |
|
1411 |
return std::make_unique<TemporalLayersChecker>(num_temporal_layers); |
|
1412 |
+ default: |
|
1413 |
+ RTC_NOTREACHED(); |
|
1414 |
+ return nullptr; |
|
1415 |
} |
|
1416 |
} |
|
1417 |
||
1418 |
Index: firefox-102.0/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
|
1419 |
=================================================================== |
|
1420 |
--- firefox-102.0.orig/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
|
1421 |
+++ firefox-102.0/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
|
1422 |
@@ -54,6 +54,9 @@ std::string ToString(VideoAdaptationReas |
|
1423 |
return "quality"; |
|
1424 |
case VideoAdaptationReason::kCpu: |
|
1425 |
return "cpu"; |
|
1426 |
+ default: |
|
1427 |
+ RTC_NOTREACHED(); |
|
1428 |
+ return ""; |
|
1429 |
} |
|
1430 |
} |
|
1431 |
||
1432 |
Index: firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/ast_to_hir.cpp |
|
1433 |
=================================================================== |
|
1434 |
--- firefox-102.0.orig/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/ast_to_hir.cpp |
|
1435 |
+++ firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/ast_to_hir.cpp |
|
1436 |
@@ -2651,6 +2651,7 @@ get_type_name_for_precision_qualifier(co |
|
| 1162 | 1437 |
default: |
1438 |
unreachable("Unsupported type");
|
|
1439 |
} /* base type */ |
|
1440 |
+ return ""; |
|
1441 |
} |
|
1442 |
||
1443 |
static unsigned |
|
| 1175 | 1444 |
Index: firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/ir.cpp |
1445 |
=================================================================== |
|
1446 |
--- firefox-102.0.orig/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/ir.cpp |
|
1447 |
+++ firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/ir.cpp |
|
1448 |
@@ -624,6 +624,7 @@ ir_expression::get_num_operands(ir_expre |
|
| 1162 | 1449 |
return 4; |
1450 |
||
1451 |
unreachable("Could not calculate number of operands");
|
|
1452 |
+ return -1; |
|
1453 |
} |
|
1454 |
||
1455 |
#include "ir_expression_operation_strings.h" |
|
| 1175 | 1456 |
Index: firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/loop_analysis.cpp |
1457 |
=================================================================== |
|
1458 |
--- firefox-102.0.orig/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/loop_analysis.cpp |
|
1459 |
+++ firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/loop_analysis.cpp |
|
1460 |
@@ -239,6 +239,7 @@ incremented_before_terminator(ir_loop *l |
|
| 1162 | 1461 |
} |
1462 |
||
1463 |
unreachable("Unable to find induction variable");
|
|
1464 |
+ return false; |
|
1465 |
} |
|
1466 |
||
1467 |
/** |
|
| 1175 | 1468 |
Index: firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/opt_vectorize.cpp |
1469 |
=================================================================== |
|
1470 |
--- firefox-102.0.orig/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/opt_vectorize.cpp |
|
1471 |
+++ firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/opt_vectorize.cpp |
|
1472 |
@@ -229,6 +229,7 @@ write_mask_to_swizzle(unsigned write_mas |
|
| 1162 | 1473 |
case WRITEMASK_W: return SWIZZLE_W; |
1474 |
} |
|
1475 |
unreachable("not reached");
|
|
1476 |
+ return 0; |
|
1477 |
} |
|
1478 |
||
1479 |
/** |
|
| 1175 | 1480 |
Index: firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl_types.cpp |
1481 |
=================================================================== |
|
1482 |
--- firefox-102.0.orig/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl_types.cpp |
|
1483 |
+++ firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl_types.cpp |
|
1484 |
@@ -460,6 +460,7 @@ const glsl_type *glsl_type::get_bare_typ |
|
| 1162 | 1485 |
} |
1486 |
||
1487 |
unreachable("Invalid base type");
|
|
1488 |
+ return nullptr; |
|
1489 |
} |
|
1490 |
||
1491 |
const glsl_type *glsl_type::get_float16_type() const |
|
| 1175 | 1492 |
@@ -2016,6 +2017,7 @@ glsl_type::get_explicit_std140_type(bool |
| 1162 | 1493 |
return type; |
1494 |
} else {
|
|
1495 |
unreachable("Invalid type for UBO or SSBO");
|
|
1496 |
+ return nullptr; |
|
1497 |
} |
|
1498 |
} |
|
1499 |
||
| 1175 | 1500 |
@@ -2374,6 +2376,7 @@ glsl_type::get_explicit_std430_type(bool |
| 1162 | 1501 |
return type; |
1502 |
} else {
|
|
1503 |
unreachable("Invalid type for SSBO");
|
|
1504 |
+ return nullptr; |
|
1505 |
} |
|
1506 |
} |
|
1507 |
||
| 1175 | 1508 |
@@ -2448,6 +2451,7 @@ glsl_type::get_explicit_type_for_size_al |
| 1162 | 1509 |
this->matrix_columns, stride, false); |
1510 |
} else {
|
|
1511 |
unreachable("Unhandled type.");
|
|
1512 |
+ return nullptr; |
|
1513 |
} |
|
1514 |
} |
|
1515 |
||
| 1175 | 1516 |
@@ -2948,6 +2952,7 @@ glsl_get_sampler_dim_coordinate_componen |
| 1162 | 1517 |
return 3; |
1518 |
default: |
|
1519 |
unreachable("Unknown sampler dim");
|
|
1520 |
+ return -1; |
|
1521 |
} |
|
1522 |
} |
|
1523 |
||
| 1175 | 1524 |
Index: firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/mesa/main/shaderobj.h |
1525 |
=================================================================== |
|
1526 |
--- firefox-102.0.orig/third_party/rust/glslopt/glsl-optimizer/src/mesa/main/shaderobj.h |
|
1527 |
+++ firefox-102.0/third_party/rust/glslopt/glsl-optimizer/src/mesa/main/shaderobj.h |
|
1528 |
@@ -185,6 +185,7 @@ _mesa_shader_stage_from_subroutine_unifo |
|
| 1162 | 1529 |
return MESA_SHADER_TESS_EVAL; |
1530 |
} |
|
1531 |
unreachable("not reached");
|
|
1532 |
+ return MESA_SHADER_NONE; |
|
1533 |
} |
|
1534 |
||
1535 |
static inline gl_shader_stage |
|
| 1175 | 1536 |
@@ -205,6 +206,7 @@ _mesa_shader_stage_from_subroutine(GLenu |
| 1162 | 1537 |
return MESA_SHADER_TESS_EVAL; |
1538 |
} |
|
1539 |
unreachable("not reached");
|
|
1540 |
+ return MESA_SHADER_NONE; |
|
1541 |
} |
|
1542 |
||
1543 |
static inline GLenum |
|
| 1175 | 1544 |
@@ -230,6 +232,7 @@ _mesa_shader_stage_to_subroutine(gl_shad |
| 1162 | 1545 |
break; |
1546 |
} |
|
1547 |
unreachable("not reached");
|
|
1548 |
+ return GL_VERTEX_PROGRAM_ARB; |
|
1549 |
} |
|
1550 |
||
1551 |
static inline GLenum |
|
| 1175 | 1552 |
@@ -253,6 +256,7 @@ _mesa_shader_stage_to_subroutine_uniform |
| 1162 | 1553 |
break; |
1554 |
} |
|
1555 |
unreachable("not reached");
|
|
1556 |
+ return GL_VERTEX_PROGRAM_ARB; |
|
1557 |
} |
|
1558 |
||
1559 |
extern bool |