mozilla-silence-no-return-type.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Thu, 17 Sep 2020 14:32:09 +0200
branchfirefox80
changeset 1143 ff28137410eb
permissions -rw-r--r--
FF8 80.0.1 including some required patches (see changes)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1143
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
diff -rup firefox-80.0.1.orig/gfx/skia/skia/include/codec/SkEncodedOrigin.h firefox-80.0.1/gfx/skia/skia/include/codec/SkEncodedOrigin.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
--- firefox-80.0.1.orig/gfx/skia/skia/include/codec/SkEncodedOrigin.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
+++ firefox-80.0.1/gfx/skia/skia/include/codec/SkEncodedOrigin.h	2020-09-05 17:20:04.093066839 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
@@ -41,6 +41,7 @@ static inline SkMatrix SkEncodedOriginTo
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
         case  kLeftBottom_SkEncodedOrigin: return SkMatrix::MakeAll( 0,  1, 0, -1,  0, w, 0, 0, 1);
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
     SK_ABORT("Unexpected origin");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
diff -rup firefox-80.0.1.orig/gfx/skia/skia/include/private/GrTypesPriv.h firefox-80.0.1/gfx/skia/skia/include/private/GrTypesPriv.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
--- firefox-80.0.1.orig/gfx/skia/skia/include/private/GrTypesPriv.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
+++ firefox-80.0.1/gfx/skia/skia/include/private/GrTypesPriv.h	2020-09-05 16:27:55.719487864 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
@@ -540,6 +540,7 @@ static inline GrSLType GrSLCombinedSampl
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
             SK_ABORT("Unexpected texture type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 /** Rectangle and external textures only support the clamp wrap mode and do not support
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
@@ -556,6 +557,7 @@ static inline bool GrTextureTypeHasRestr
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
             SK_ABORT("Unexpected texture type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
 static constexpr bool GrSLTypeIsCombinedSamplerType(GrSLType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
@@ -858,6 +860,7 @@ static inline size_t GrCompressedFormatD
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
     SK_ABORT("Invalid pixel config");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
 /**
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/core/SkGeometry.h firefox-80.0.1/gfx/skia/skia/src/core/SkGeometry.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
--- firefox-80.0.1.orig/gfx/skia/skia/src/core/SkGeometry.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
+++ firefox-80.0.1/gfx/skia/skia/src/core/SkGeometry.h	2020-09-05 17:33:51.896635366 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
@@ -182,6 +182,7 @@ static inline bool SkCubicIsDegenerate(S
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
             return true;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
     SK_ABORT("Invalid SkCubicType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
 static inline const char* SkCubicTypeName(SkCubicType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
@@ -194,6 +195,7 @@ static inline const char* SkCubicTypeNam
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
         case SkCubicType::kLineOrPoint: return "kLineOrPoint";
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    53
     SK_ABORT("Invalid SkCubicType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    54
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    55
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    56
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    57
 /** Returns the cubic classification.
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    58
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTextBlob.cpp firefox-80.0.1/gfx/skia/skia/src/core/SkTextBlob.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    59
--- firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTextBlob.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    60
+++ firefox-80.0.1/gfx/skia/skia/src/core/SkTextBlob.cpp	2020-09-05 17:33:19.028493560 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    61
@@ -201,6 +201,7 @@ void SkTextBlob::operator delete(void* p
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    62
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    63
 void* SkTextBlob::operator new(size_t) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    64
     SK_ABORT("All blobs are created by placement new.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    65
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    66
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    67
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    68
 void* SkTextBlob::operator new(size_t, void* p) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    69
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTypeface_remote.cpp firefox-80.0.1/gfx/skia/skia/src/core/SkTypeface_remote.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    70
--- firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTypeface_remote.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    71
+++ firefox-80.0.1/gfx/skia/skia/src/core/SkTypeface_remote.cpp	2020-09-05 17:33:09.424452127 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    72
@@ -29,6 +29,7 @@ void SkScalerContextProxy::initCache(SkS
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    73
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    74
 unsigned SkScalerContextProxy::generateGlyphCount()  {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    75
     SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    76
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    77
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    78
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    79
 bool SkScalerContextProxy::generateAdvance(SkGlyph* glyph) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    80
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTypeface_remote.h firefox-80.0.1/gfx/skia/skia/src/core/SkTypeface_remote.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    81
--- firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTypeface_remote.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    82
+++ firefox-80.0.1/gfx/skia/skia/src/core/SkTypeface_remote.h	2020-09-05 17:34:55.424909478 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    83
@@ -63,23 +63,28 @@ public:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    84
     bool isLogging() const {return fIsLogging;}
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    85
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    86
 protected:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    87
-    int onGetUPEM() const override { SK_ABORT("Should never be called."); }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    88
+    int onGetUPEM() const override { SK_ABORT("Should never be called."); SkUNREACHABLE; }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    89
     std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    90
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    91
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    92
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    93
     std::unique_ptr<SkFontData> onMakeFontData() const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    94
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    95
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    96
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    97
     sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    98
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    99
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   100
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   101
     int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[],
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   102
                                      int coordinateCount) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   103
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   104
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   105
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   106
     int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   107
                                        int parameterCount) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   108
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   109
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   110
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   111
     void onGetFamilyName(SkString* familyName) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   112
         // Used by SkStrikeCache::DumpMemoryStatistics.
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   113
@@ -87,12 +92,15 @@ protected:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   114
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   115
     SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   116
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   117
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   118
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   119
     int onGetTableTags(SkFontTableTag tags[]) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   120
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   121
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   122
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   123
     size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   124
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   125
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   126
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   127
     SkScalerContext* onCreateScalerContext(const SkScalerContextEffects& effects,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   128
                                            const SkDescriptor* desc) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   129
@@ -116,6 +124,7 @@ protected:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   130
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   131
     std::unique_ptr<SkAdvancedTypefaceMetrics> onGetAdvancedMetrics() const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   132
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   133
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   134
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   135
     void onCharsToGlyphs(const SkUnichar* chars, int count, SkGlyphID glyphs[]) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   136
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   137
@@ -126,6 +135,7 @@ protected:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   138
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   139
     void* onGetCTFontRef() const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   140
         SK_ABORT("Should never be called.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   141
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   142
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   143
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   144
 private:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   145
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp firefox-80.0.1/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   146
--- firefox-80.0.1.orig/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   147
+++ firefox-80.0.1/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp	2020-09-05 17:35:26.657044250 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   148
@@ -144,6 +144,7 @@ static GrTextureDomain::Mode to_texture_
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   149
             return GrTextureDomain::kRepeat_Mode;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   150
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   151
             SK_ABORT("Unsupported tile mode.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   152
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   153
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   154
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   155
 #endif
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   156
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp firefox-80.0.1/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   157
--- firefox-80.0.1.orig/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   158
+++ firefox-80.0.1/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp	2020-09-05 17:35:30.841062305 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   159
@@ -1701,6 +1701,7 @@ static SkImageFilterLight* create_random
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   160
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   161
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   162
             SK_ABORT("Unexpected value.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   163
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   164
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   165
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   166
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   167
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp firefox-80.0.1/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   168
--- firefox-80.0.1.orig/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   169
+++ firefox-80.0.1/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp	2020-09-05 17:35:41.193106978 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   170
@@ -69,6 +69,7 @@ void SkFontMgr_Indirect::onGetFamilyName
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   171
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   172
 SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   173
     SK_ABORT("Not implemented");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   174
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   175
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   176
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   177
 SkFontStyleSet* SkFontMgr_Indirect::onMatchFamily(const char familyName[]) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   178
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrDataUtils.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrDataUtils.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   179
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrDataUtils.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   180
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrDataUtils.cpp	2020-09-05 17:26:21.958694975 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   181
@@ -128,6 +128,7 @@ size_t GrCompressedDataSize(SkImage::Com
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   182
             return numBlocks * sizeof(ETC1Block);
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   183
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   184
     SK_ABORT("Unexpected compression type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   185
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   186
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   187
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   188
 size_t GrCompressedRowBytes(SkImage::CompressionType type, int width) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   189
@@ -137,6 +138,7 @@ size_t GrCompressedRowBytes(SkImage::Com
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   190
             return numBlocksWidth * sizeof(ETC1Block);
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   191
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   192
     SK_ABORT("Unexpected compression type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   193
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   194
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   195
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   196
 // Fill in 'dest' with ETC1 blocks derived from 'colorf'
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   197
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrFragmentProcessor.h firefox-80.0.1/gfx/skia/skia/src/gpu/GrFragmentProcessor.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   198
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrFragmentProcessor.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   199
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrFragmentProcessor.h	2020-09-05 17:26:07.414632282 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   200
@@ -375,6 +375,7 @@ protected:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   201
 private:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   202
     virtual SkPMColor4f constantOutputForConstantInput(const SkPMColor4f& /* inputColor */) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   203
         SK_ABORT("Subclass must override this if advertising this optimization.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   204
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   205
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   206
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   207
     /** Returns a new instance of the appropriate *GL* implementation class
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   208
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrPathRendering.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrPathRendering.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   209
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrPathRendering.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   210
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrPathRendering.cpp	2020-09-05 17:28:44.215308274 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   211
@@ -19,6 +19,7 @@ const GrUserStencilSettings& GrPathRende
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   212
     switch (fill) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   213
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   214
             SK_ABORT("Unexpected path fill.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   215
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   216
         case GrPathRendering::kWinding_FillType: {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   217
             constexpr static GrUserStencilSettings kWindingStencilPass(
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   218
                 GrUserStencilSettings::StaticInit<
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   219
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrPathRendering.h firefox-80.0.1/gfx/skia/skia/src/gpu/GrPathRendering.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   220
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrPathRendering.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   221
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrPathRendering.h	2020-09-05 17:28:31.247252358 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   222
@@ -63,6 +63,7 @@ public:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   223
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   224
             default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   225
                 SK_ABORT("Unknown path transform type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   226
+		SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   227
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   228
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   229
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   230
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   231
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   232
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp	2020-09-05 17:21:37.549469393 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   233
@@ -20,6 +20,7 @@ std::unique_ptr<GrFragmentProcessor> GrP
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   234
     return fp;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   235
 #else
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   236
     SK_ABORT("Should not be called if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   237
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   238
 #endif
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   239
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   240
 #endif
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   241
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrReducedClip.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrReducedClip.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   242
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrReducedClip.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   243
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrReducedClip.cpp	2020-09-05 17:28:39.151286438 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   244
@@ -525,6 +525,7 @@ GrReducedClip::ClipResult GrReducedClip:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   245
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   246
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   247
     SK_ABORT("Unexpected DeviceSpaceType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   248
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   249
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   250
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   251
 GrReducedClip::ClipResult GrReducedClip::clipOutsideElement(const Element* element) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   252
@@ -591,6 +592,7 @@ GrReducedClip::ClipResult GrReducedClip:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   253
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   254
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   255
     SK_ABORT("Unexpected DeviceSpaceType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   256
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   257
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   258
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   259
 inline void GrReducedClip::addWindowRectangle(const SkRect& elementInteriorRect, bool elementIsAA) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   260
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrResourceCache.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrResourceCache.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   261
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrResourceCache.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   262
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrResourceCache.cpp	2020-09-05 17:24:04.038100548 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   263
@@ -40,6 +40,7 @@ GrScratchKey::ResourceType GrScratchKey:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   264
     int32_t type = nextType++;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   265
     if (type > SkTo<int32_t>(UINT16_MAX)) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   266
         SK_ABORT("Too many Resource Types");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   267
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   268
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   269
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   270
     return static_cast<ResourceType>(type);
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   271
@@ -51,6 +52,7 @@ GrUniqueKey::Domain GrUniqueKey::Generat
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   272
     int32_t domain = nextDomain++;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   273
     if (domain > SkTo<int32_t>(UINT16_MAX)) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   274
         SK_ABORT("Too many GrUniqueKey Domains");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   275
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   276
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   277
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   278
     return static_cast<Domain>(domain);
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   279
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrShaderVar.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrShaderVar.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   280
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrShaderVar.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   281
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrShaderVar.cpp	2020-09-05 17:21:29.397434277 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   282
@@ -18,6 +18,7 @@ static const char* type_modifier_string(
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   283
         case GrShaderVar::kUniform_TypeModifier: return "uniform";
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   284
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   285
     SK_ABORT("Unknown shader variable type modifier.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   286
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   287
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   288
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   289
 void GrShaderVar::setIOType(GrIOType ioType) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   290
@@ -32,6 +33,7 @@ void GrShaderVar::setIOType(GrIOType ioT
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   291
             return;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   292
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   293
     SK_ABORT("Unknown io type.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   294
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   295
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   296
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   297
 void GrShaderVar::appendDecl(const GrShaderCaps* shaderCaps, SkString* out) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   298
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/SkGpuDevice.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/SkGpuDevice.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   299
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/SkGpuDevice.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   300
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/SkGpuDevice.cpp	2020-09-05 17:30:38.891802801 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   301
@@ -283,6 +283,7 @@ static inline GrPrimitiveType point_mode
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   302
             return GrPrimitiveType::kLineStrip;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   303
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   304
     SK_ABORT("Unexpected mode");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   305
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   306
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   307
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   308
 void SkGpuDevice::drawPoints(SkCanvas::PointMode mode,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   309
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/SkGr.h firefox-80.0.1/gfx/skia/skia/src/gpu/SkGr.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   310
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/SkGr.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   311
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/SkGr.h	2020-09-05 17:30:45.151829800 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   312
@@ -159,6 +159,7 @@ static inline GrPrimitiveType SkVertexMo
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   313
             break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   314
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   315
     SK_ABORT("Invalid mode");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   316
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   317
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   318
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   319
 //////////////////////////////////////////////////////////////////////////////
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   320
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   321
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   322
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h	2020-09-05 17:32:06.476180575 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   323
@@ -240,6 +240,7 @@ inline const char* GrCCCoverageProcessor
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   324
         case PrimitiveType::kConics: return "kConics";
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   325
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   326
     SK_ABORT("Invalid PrimitiveType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   327
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   328
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   329
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   330
 inline void GrCCCoverageProcessor::TriPointInstance::set(
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   331
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   332
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   333
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp	2020-09-05 17:32:10.548198140 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   334
@@ -60,6 +60,7 @@ static GrCCStrokeGeometry::Verb join_ver
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   335
             return Verb::kRoundJoin;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   336
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   337
     SK_ABORT("Invalid SkPaint::Join.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   338
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   339
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   340
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   341
 void GrCCStrokeGeometry::beginPath(const SkStrokeRec& stroke, float strokeDevWidth,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   342
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   343
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   344
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h	2020-09-05 17:32:25.116260983 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   345
@@ -175,5 +175,6 @@ inline bool GrCCStrokeGeometry::IsIntern
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   346
             return false;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   347
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   348
     SK_ABORT("Invalid GrCCStrokeGeometry::Verb.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   349
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   350
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   351
 #endif
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   352
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   353
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   354
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp	2020-09-05 17:32:16.092222055 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   355
@@ -164,6 +164,7 @@ GrPathRenderer::CanDrawPath GrCoverageCo
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   356
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   357
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   358
     SK_ABORT("Invalid stroke style.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   359
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   360
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   361
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   362
 bool GrCoverageCountingPathRenderer::onDrawPath(const DrawPathArgs& args) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   363
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   364
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   365
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp	2020-09-05 17:32:20.524241174 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   366
@@ -550,4 +550,5 @@ GrGLSLPrimitiveProcessor* GrVSCoveragePr
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   367
             return new Impl(std::move(shader), 4);
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   368
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   369
     SK_ABORT("Invalid PrimitiveType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   370
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   371
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   372
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   373
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   374
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp	2020-09-05 17:29:04.783396962 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   375
@@ -39,7 +39,9 @@ static dawn::LoadOp to_dawn_load_op(GrLo
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   376
             return dawn::LoadOp::Clear;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   377
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   378
             SK_ABORT("Invalid LoadOp");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   379
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   380
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   381
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   382
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   383
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   384
 GrDawnOpsRenderPass::GrDawnOpsRenderPass(GrDawnGpu* gpu, GrRenderTarget* rt, GrSurfaceOrigin origin,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   385
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   386
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   387
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp	2020-09-05 17:29:19.431460126 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   388
@@ -95,6 +95,7 @@ uint32_t grsltype_to_alignment_mask(GrSL
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   389
             break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   390
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   391
     SK_ABORT("Unexpected type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   392
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   393
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   394
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   395
 static inline uint32_t grsltype_to_size(GrSLType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   396
@@ -173,6 +174,7 @@ static inline uint32_t grsltype_to_size(
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   397
             break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   398
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   399
     SK_ABORT("Unexpected type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   400
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   401
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   402
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   403
 uint32_t get_ubo_offset(uint32_t* currentOffset,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   404
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   405
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   406
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp	2020-09-05 17:29:23.527477789 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   407
@@ -76,6 +76,7 @@ static inline int grsltype_to_location_s
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   408
              return 0;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   409
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   410
     SK_ABORT("Unexpected type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   411
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   412
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   413
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   414
 static void finalize_helper(GrDawnVaryingHandler::VarArray& vars) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   415
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   416
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   417
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp	2020-09-05 17:31:23.039993215 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   418
@@ -58,6 +58,7 @@ void main() {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   419
                 return color * input;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   420
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   421
         SK_ABORT("Unexpected mode");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   422
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   423
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   424
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   425
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   426
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   427
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   428
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp	2020-09-05 17:31:42.796078430 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   429
@@ -204,6 +204,7 @@ const GrXPFactory* GrCoverageSetOpXPFact
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   430
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   431
 #undef _CONSTEXPR_
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   432
     SK_ABORT("Unknown region op.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   433
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   434
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   435
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   436
 sk_sp<const GrXferProcessor> GrCoverageSetOpXPFactory::makeXferProcessor(
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   437
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   438
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   439
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp	2020-09-05 17:31:32.900035745 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   440
@@ -753,6 +753,7 @@ const GrXPFactory* GrPorterDuffXPFactory
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   441
             return &gScreenPDXPF;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   442
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   443
             SK_ABORT("Unexpected blend mode.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   444
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   445
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   446
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   447
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   448
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   449
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   450
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp	2020-09-05 17:31:49.900109073 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   451
@@ -154,6 +154,7 @@ public:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   452
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   453
         printf("%s\n", SkSL::String(type.fName).c_str());
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   454
         SK_ABORT("unsupported uniform type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   455
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   456
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   457
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   458
     void emitCode(EmitArgs& args) override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   459
@@ -568,6 +569,7 @@ std::unique_ptr<GrFragmentProcessor> GrS
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   460
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   461
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   462
     SK_ABORT("unreachable");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   463
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   464
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   465
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   466
 #endif
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   467
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h firefox-80.0.1/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   468
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   469
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h	2020-09-05 17:30:53.303864960 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   470
@@ -41,6 +41,7 @@ public:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   471
                 return color * input;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   472
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   473
         SK_ABORT("Unexpected mode");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   474
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   475
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   476
     static std::unique_ptr<GrFragmentProcessor> Make(SkPMColor4f color, InputMode mode) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   477
         return std::unique_ptr<GrFragmentProcessor>(new GrConstColorProcessor(color, mode));
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   478
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/geometry/GrShape.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/geometry/GrShape.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   479
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/geometry/GrShape.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   480
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/geometry/GrShape.cpp	2020-09-05 17:26:35.670754081 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   481
@@ -164,6 +164,7 @@ SkRect GrShape::bounds() const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   482
             return this->path().getBounds();
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   483
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   484
     SK_ABORT("Unknown shape type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   485
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   486
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   487
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   488
 SkRect GrShape::styledBounds() const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   489
@@ -254,6 +255,7 @@ int GrShape::unstyledKeySize() const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   490
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   491
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   492
     SK_ABORT("Should never get here.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   493
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   494
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   495
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   496
 void GrShape::writeUnstyledKey(uint32_t* key) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   497
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   498
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   499
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp	2020-09-05 17:23:12.109876788 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   500
@@ -4159,6 +4159,7 @@ GrBackendFormat GrGLCaps::getBackendForm
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   501
             return GrBackendFormat::MakeGL(GR_GL_COMPRESSED_ETC1_RGB8, GR_GL_TEXTURE_2D);
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   502
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   503
     SK_ABORT("Invalid compression type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   504
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   505
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   506
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   507
 GrSwizzle GrGLCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   508
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   509
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   510
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp	2020-09-05 17:22:08.885604389 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   511
@@ -68,4 +68,5 @@ bool GrGLGetGLSLGeneration(const GrGLInt
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   512
         return true;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   513
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   514
     SK_ABORT("Unknown GL Standard");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   515
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   516
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   517
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   518
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   519
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp	2020-09-05 17:23:04.717844938 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   520
@@ -196,6 +196,7 @@ static int gl_target_to_binding_index(Gr
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   521
             return 2;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   522
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   523
     SK_ABORT("Unexpected GL texture target.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   524
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   525
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   526
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   527
 GrGpuResource::UniqueID GrGLGpu::TextureUnitBindings::boundID(GrGLenum target) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   528
@@ -234,6 +235,7 @@ static GrGLenum filter_to_gl_mag_filter(
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   529
         case GrSamplerState::Filter::kMipMap:  return GR_GL_LINEAR;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   530
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   531
     SK_ABORT("Unknown filter");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   532
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   533
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   534
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   535
 static GrGLenum filter_to_gl_min_filter(GrSamplerState::Filter filter) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   536
@@ -243,6 +245,7 @@ static GrGLenum filter_to_gl_min_filter(
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   537
         case GrSamplerState::Filter::kMipMap:  return GR_GL_LINEAR_MIPMAP_LINEAR;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   538
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   539
     SK_ABORT("Unknown filter");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   540
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   541
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   542
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   543
 static inline GrGLenum wrap_mode_to_gl_wrap(GrSamplerState::WrapMode wrapMode,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   544
@@ -257,6 +260,7 @@ static inline GrGLenum wrap_mode_to_gl_w
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   545
             return GR_GL_CLAMP_TO_BORDER;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   546
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   547
     SK_ABORT("Unknown wrap mode");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   548
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   549
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   550
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   551
 ///////////////////////////////////////////////////////////////////////////////
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   552
@@ -1107,7 +1111,7 @@ static bool renderbuffer_storage_msaa(co
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   553
             break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   554
         case GrGLCaps::kNone_MSFBOType:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   555
             SK_ABORT("Shouldn't be here if we don't support multisampled renderbuffers.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   556
-            break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   557
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   558
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   559
     return (GR_GL_NO_ERROR == CHECK_ALLOC_ERROR(ctx.interface()));
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   560
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   561
@@ -2275,9 +2279,10 @@ static GrGLenum gr_primitive_type_to_gl_
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   562
             return GR_GL_LINE_STRIP;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   563
         case GrPrimitiveType::kPath:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   564
             SK_ABORT("non-mesh-based GrPrimitiveType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   565
-            return 0;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   566
+            SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   567
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   568
     SK_ABORT("invalid GrPrimitiveType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   569
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   570
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   571
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   572
 void GrGLGpu::sendMeshToGpu(GrPrimitiveType primitiveType, const GrBuffer* vertexBuffer,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   573
@@ -4006,7 +4011,8 @@ int GrGLGpu::TextureToCopyProgramIdx(GrT
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   574
         case kTextureExternalSampler_GrSLType:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   575
             return 2;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   576
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   577
-            SK_ABORT("Unexpected samper type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   578
+            SK_ABORT("Unexpected sampler type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   579
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   580
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   581
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   582
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   583
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   584
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   585
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp	2020-09-05 17:23:22.477921462 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   586
@@ -197,6 +197,7 @@ static GrPathRendering::FillType convert
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   587
     switch (fill) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   588
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   589
             SK_ABORT("Incomplete Switch\n");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   590
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   591
         case SkPath::kWinding_FillType:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   592
         case SkPath::kInverseWinding_FillType:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   593
             return GrPathRendering::kWinding_FillType;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   594
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   595
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   596
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp	2020-09-05 17:22:32.685706927 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   597
@@ -25,6 +25,7 @@ GrTextureType GrGLTexture::TextureTypeFr
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   598
             return GrTextureType::kExternal;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   599
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   600
     SK_ABORT("Unexpected texture target");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   601
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   602
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   603
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   604
 static inline GrGLenum target_from_texture_type(GrTextureType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   605
@@ -37,8 +38,10 @@ static inline GrGLenum target_from_textu
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   606
             return GR_GL_TEXTURE_EXTERNAL;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   607
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   608
             SK_ABORT("Unexpected texture target");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   609
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   610
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   611
     SK_ABORT("Unexpected texture type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   612
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   613
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   614
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   615
 // Because this class is virtually derived from GrSurface we must explicitly call its constructor.
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   616
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   617
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   618
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp	2020-09-05 17:23:27.989945214 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   619
@@ -80,6 +80,7 @@ static AttribLayout attrib_layout(GrVert
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   620
             return {true, 4, GR_GL_UNSIGNED_SHORT};
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   621
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   622
     SK_ABORT("Unknown vertex attrib type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   623
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   624
 };
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   625
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   626
 void GrGLAttribArrayState::set(GrGLGpu* gpu,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   627
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   628
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   629
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp	2020-09-05 17:30:03.215648939 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   630
@@ -98,4 +98,5 @@ const char* GrGLSLTypeString(GrSLType t)
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   631
             return "sampler";
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   632
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   633
     SK_ABORT("Unknown shader var type.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   634
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   635
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   636
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   637
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   638
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp	2020-09-05 17:30:16.439705971 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   639
@@ -35,6 +35,7 @@ static bool use_flat_interpolation(GrGLS
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   640
             return true;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   641
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   642
     SK_ABORT("Invalid interpolation");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   643
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   644
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   645
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   646
 void GrGLSLVaryingHandler::addVarying(const char* name, GrGLSLVarying* varying,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   647
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   648
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   649
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp	2020-09-05 17:30:09.799677334 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   650
@@ -51,6 +51,7 @@ static const char* input_type_name(GrGLS
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   651
         case InputType::kTriangles: return "triangles";
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   652
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   653
     SK_ABORT("invalid input type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   654
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   655
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   656
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   657
 static const char* output_type_name(GrGLSLGeometryBuilder::OutputType out) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   658
@@ -61,6 +62,7 @@ static const char* output_type_name(GrGL
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   659
         case OutputType::kTriangleStrip: return "triangle_strip";
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   660
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   661
     SK_ABORT("invalid output type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   662
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   663
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   664
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   665
 void GrGLSLGeometryBuilder::configure(InputType inputType, OutputType outputType, int maxVertices,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   666
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   667
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   668
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm	2020-09-05 17:27:20.846948832 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   669
@@ -506,6 +506,7 @@ size_t GrMtlCaps::GetFormatIndex(MTLPixe
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   670
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   671
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   672
     SK_ABORT("Invalid MTLPixelFormat");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   673
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   674
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   675
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   676
 void GrMtlCaps::initFormatTable() {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   677
@@ -1011,6 +1012,7 @@ GrBackendFormat GrMtlCaps::getBackendFor
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   678
 #endif
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   679
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   680
     SK_ABORT("Invalid compression type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   681
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   682
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   683
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   684
 GrSwizzle GrMtlCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   685
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   686
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   687
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm	2020-09-05 17:26:49.110812019 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   688
@@ -155,6 +155,7 @@ static inline MTLVertexFormat attribute_
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   689
             return MTLVertexFormatUShort4Normalized;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   690
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   691
     SK_ABORT("Unknown vertex attribute type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   692
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   693
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   694
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   695
 static MTLVertexDescriptor* create_vertex_descriptor(const GrPrimitiveProcessor& primProc) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   696
@@ -276,6 +277,7 @@ static MTLBlendFactor blend_coeff_to_mtl
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   697
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   698
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   699
     SK_ABORT("Unknown blend coefficient");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   700
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   701
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   702
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   703
 static MTLBlendOperation blend_equation_to_mtl_blend_op(GrBlendEquation equation) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   704
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   705
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   706
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm	2020-09-05 17:26:53.606831401 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   707
@@ -38,6 +38,7 @@ static inline MTLSamplerAddressMode wrap
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   708
             }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   709
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   710
     SK_ABORT("Unknown wrap mode.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   711
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   712
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   713
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   714
 GrMtlSampler* GrMtlSampler::Create(const GrMtlGpu* gpu, const GrSamplerState& samplerState) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   715
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   716
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   717
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm	2020-09-05 17:27:08.118893961 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   718
@@ -90,6 +90,7 @@ static uint32_t grsltype_to_alignment_ma
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   719
             break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   720
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   721
     SK_ABORT("Unexpected type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   722
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   723
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   724
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   725
 /** Returns the size in bytes taken up in Metal buffers for GrSLTypes. */
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   726
@@ -172,6 +173,7 @@ static inline uint32_t grsltype_to_mtl_s
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   727
             break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   728
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   729
     SK_ABORT("Unexpected type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   730
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   731
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   732
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   733
 // Given the current offset into the ubo, calculate the offset for the uniform we're trying to add
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   734
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   735
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   736
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm	2020-09-05 17:27:01.606865888 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   737
@@ -112,6 +112,7 @@ bool GrPixelConfigToMTLFormat(GrPixelCon
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   738
             return true;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   739
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   740
     SK_ABORT("Unexpected config");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   741
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   742
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   743
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   744
 MTLTextureDescriptor* GrGetMTLTextureDescriptor(id<MTLTexture> mtlTexture) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   745
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   746
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   747
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp	2020-09-05 17:27:56.087100762 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   748
@@ -610,6 +610,7 @@ static uint32_t seed_vertices(GrPrimitiv
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   749
             return 0;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   750
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   751
     SK_ABORT("Incomplete switch\n");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   752
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   753
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   754
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   755
 static uint32_t primitive_vertices(GrPrimitiveType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   756
@@ -627,6 +628,7 @@ static uint32_t primitive_vertices(GrPri
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   757
             return 0;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   758
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   759
     SK_ABORT("Incomplete switch\n");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   760
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   761
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   762
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   763
 static SkPoint random_point(SkRandom* random, SkScalar min, SkScalar max) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   764
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   765
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   766
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp	2020-09-05 17:27:40.111031883 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   767
@@ -823,4 +823,5 @@ static bool can_use_hw_derivatives_with_
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   768
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   769
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   770
     SK_ABORT("Invalid round rect type.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   771
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   772
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   773
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   774
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   775
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp	2020-09-05 17:28:03.935134598 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   776
@@ -2283,6 +2283,7 @@ static int rrect_type_to_vert_count(RRec
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   777
             return kVertsPerOverstrokeRRect;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   778
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   779
     SK_ABORT("Invalid type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   780
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   781
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   782
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   783
 static int rrect_type_to_index_count(RRectType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   784
@@ -2295,6 +2296,7 @@ static int rrect_type_to_index_count(RRe
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   785
             return kIndicesPerOverstrokeRRect;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   786
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   787
     SK_ABORT("Invalid type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   788
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   789
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   790
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   791
 static const uint16_t* rrect_type_to_indices(RRectType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   792
@@ -2306,6 +2308,7 @@ static const uint16_t* rrect_type_to_ind
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   793
             return gOverstrokeRRectIndices;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   794
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   795
     SK_ABORT("Invalid type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   796
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   797
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   798
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   799
 ///////////////////////////////////////////////////////////////////////////////////////////////////
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   800
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   801
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   802
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp	2020-09-05 17:27:49.879073997 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   803
@@ -155,6 +155,7 @@ static int rrect_type_to_vert_count(RRec
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   804
             return kVertsPerOverstrokeRRect;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   805
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   806
     SK_ABORT("Invalid type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   807
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   808
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   809
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   810
 static int rrect_type_to_index_count(RRectType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   811
@@ -167,6 +168,7 @@ static int rrect_type_to_index_count(RRe
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   812
             return kIndicesPerOverstrokeRRect;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   813
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   814
     SK_ABORT("Invalid type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   815
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   816
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   817
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   818
 static const uint16_t* rrect_type_to_indices(RRectType type) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   819
@@ -178,6 +180,7 @@ static const uint16_t* rrect_type_to_ind
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   820
             return gRRectIndices;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   821
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   822
     SK_ABORT("Invalid type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   823
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   824
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   825
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   826
 ///////////////////////////////////////////////////////////////////////////////
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   827
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/text/GrTextBlob.h firefox-80.0.1/gfx/skia/skia/src/gpu/text/GrTextBlob.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   828
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/text/GrTextBlob.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   829
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/text/GrTextBlob.h	2020-09-05 17:30:30.791767867 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   830
@@ -125,6 +125,7 @@ public:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   831
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   832
     void* operator new(size_t) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   833
         SK_ABORT("All blobs are created by placement new.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   834
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   835
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   836
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   837
     void* operator new(size_t, void* p) { return p; }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   838
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   839
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   840
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp	2020-09-05 17:30:25.919746855 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   841
@@ -284,4 +284,5 @@ bool GrTextBlob::VertexRegenerator::rege
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   842
         return true;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   843
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   844
     SK_ABORT("Should not get here");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   845
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   846
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   847
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   848
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   849
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp	2020-09-05 17:25:38.166506214 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   850
@@ -108,6 +108,7 @@ static FormatCompatibilityClass format_c
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   851
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   852
         default:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   853
             SK_ABORT("Unsupported VkFormat");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   854
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   855
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   856
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   857
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   858
@@ -1656,6 +1657,7 @@ GrBackendFormat GrVkCaps::getBackendForm
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   859
             return GrBackendFormat::MakeVk(VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK);
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   860
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   861
     SK_ABORT("Invalid compression type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   862
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   863
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   864
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   865
 GrSwizzle GrVkCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   866
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   867
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   868
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp	2020-09-05 17:25:19.878427391 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   869
@@ -28,6 +28,7 @@ static BufferUsage get_buffer_usage(GrVk
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   870
             return BufferUsage::kCpuOnly;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   871
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   872
     SK_ABORT("Invalid GrVkBuffer::Type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   873
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   874
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   875
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   876
 bool GrVkMemory::AllocAndBindBufferMemory(const GrVkGpu* gpu,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   877
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   878
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   879
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp	2020-09-05 17:25:48.238549627 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   880
@@ -80,6 +80,7 @@ static inline VkFormat attrib_type_to_vk
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   881
             return VK_FORMAT_R16G16B16A16_UNORM;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   882
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   883
     SK_ABORT("Unknown vertex attrib type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   884
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   885
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   886
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   887
 static void setup_vertex_input_state(const GrPrimitiveProcessor& primProc,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   888
@@ -162,8 +163,10 @@ static VkPrimitiveTopology gr_primitive_
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   889
             return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   890
         case GrPrimitiveType::kPath:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   891
             SK_ABORT("Unsupported primitive type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   892
+	    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   893
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   894
     SK_ABORT("invalid GrPrimitiveType");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   895
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   896
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   897
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   898
 static void setup_input_assembly_state(GrPrimitiveType primitiveType,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   899
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   900
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   901
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp	2020-09-05 17:25:24.502447321 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   902
@@ -23,6 +23,7 @@ static inline VkSamplerAddressMode wrap_
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   903
             return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   904
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   905
     SK_ABORT("Unknown wrap mode.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   906
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   907
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   908
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   909
 GrVkSampler* GrVkSampler::Create(GrVkGpu* gpu, const GrSamplerState& samplerState,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   910
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   911
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   912
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h	2020-09-05 17:25:55.190579592 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   913
@@ -34,6 +34,7 @@ private:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   914
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   915
     bool onUpdateData(const void* src, size_t srcSizeInBytes) override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   916
         SK_ABORT("Not implemented for transfer buffers.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   917
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   918
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   919
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   920
     GrVkGpu* getVkGpu() const {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   921
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   922
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   923
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp	2020-09-05 17:25:14.854405738 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   924
@@ -89,6 +89,7 @@ static uint32_t grsltype_to_alignment_ma
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   925
             break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   926
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   927
     SK_ABORT("Unexpected type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   928
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   929
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   930
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   931
 /** Returns the size in bytes taken up in vulkanbuffers for GrSLTypes. */
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   932
@@ -172,6 +173,7 @@ static inline uint32_t grsltype_to_vk_si
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   933
             break;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   934
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   935
     SK_ABORT("Unexpected type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   936
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   937
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   938
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   939
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   940
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   941
--- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   942
+++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp	2020-09-05 17:25:28.502464561 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   943
@@ -74,6 +74,7 @@ static inline int grsltype_to_location_s
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   944
              return 1;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   945
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   946
     SK_ABORT("Unexpected type");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   947
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   948
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   949
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   950
 static void finalize_helper(GrVkVaryingHandler::VarArray& vars) {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   951
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/pdf/SkPDFTag.cpp firefox-80.0.1/gfx/skia/skia/src/pdf/SkPDFTag.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   952
--- firefox-80.0.1.orig/gfx/skia/skia/src/pdf/SkPDFTag.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   953
+++ firefox-80.0.1/gfx/skia/skia/src/pdf/SkPDFTag.cpp	2020-09-05 17:35:12.352982524 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   954
@@ -64,6 +64,7 @@ static const char* tag_name_from_type(Sk
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   955
         #undef M
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   956
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   957
     SK_ABORT("bad tag");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   958
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   959
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   960
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   961
 struct SkPDFTagNode {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   962
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp firefox-80.0.1/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   963
--- firefox-80.0.1.orig/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   964
+++ firefox-80.0.1/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp	2020-09-05 17:21:09.173347158 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   965
@@ -173,18 +173,22 @@ public:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   966
 protected:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   967
     int onCountFamilies() const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   968
         SK_ABORT("Not implemented.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   969
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   970
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   971
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   972
     void onGetFamilyName(int index, SkString* familyName) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   973
         SK_ABORT("Not implemented.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   974
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   975
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   976
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   977
     SkFontStyleSet* onCreateStyleSet(int index) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   978
         SK_ABORT("Not implemented.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   979
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   980
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   981
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   982
     SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   983
         SK_ABORT("Not implemented.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   984
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   985
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   986
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   987
     SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[],
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   988
@@ -215,10 +219,12 @@ protected:
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   989
                                             const char* bcp47[], int bcp47Count,
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   990
                                             SkUnichar character) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   991
         SK_ABORT("Not implemented.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   992
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   993
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   994
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   995
     SkTypeface* onMatchFaceStyle(const SkTypeface*, const SkFontStyle&) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   996
         SK_ABORT("Not implemented.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   997
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   998
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   999
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1000
     sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData> data, int ttcIndex) const override {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1001
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/shaders/SkImageShader.cpp firefox-80.0.1/gfx/skia/skia/src/shaders/SkImageShader.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1002
--- firefox-80.0.1.orig/gfx/skia/skia/src/shaders/SkImageShader.cpp	2020-08-31 16:04:09.000000000 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1003
+++ firefox-80.0.1/gfx/skia/skia/src/shaders/SkImageShader.cpp	2020-09-05 17:21:18.005385203 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1004
@@ -183,6 +183,7 @@ static GrSamplerState::WrapMode tile_mod
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1005
             return GrSamplerState::WrapMode::kClampToBorder;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1006
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1007
     SK_ABORT("Unknown tile mode.");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1008
+    SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1009
 }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1010
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1011
 std::unique_ptr<GrFragmentProcessor> SkImageShader::asFragmentProcessor(
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1012
diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/utils/SkShadowUtils.cpp firefox-80.0.1/gfx/skia/skia/src/utils/SkShadowUtils.cpp
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1013
--- firefox-80.0.1.orig/gfx/skia/skia/src/utils/SkShadowUtils.cpp	2020-09-05 13:23:03.590763363 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1014
+++ firefox-80.0.1/gfx/skia/skia/src/utils/SkShadowUtils.cpp	2020-09-05 17:32:47.792358805 +0200
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1015
@@ -149,6 +149,7 @@ struct SpotVerticesFactory {
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1016
                 return false;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1017
         }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1018
         SK_ABORT("Uninitialized occluder type?");
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1019
+	SkUNREACHABLE;
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1020
     }
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1021
 
ff28137410eb FF8 80.0.1 including some required patches (see changes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1022
     sk_sp<SkVertices> makeVertices(const SkPath& path, const SkMatrix& ctm,