blob: e64ac72fea4e85150ce1be85370509be9fafba5f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
diff -ur skia.org/include/private/SkColorData.h skia/include/private/SkColorData.h
--- skia.org/include/private/SkColorData.h 2024-10-10 13:25:03.614133252 +0200
+++ skia/include/private/SkColorData.h 2024-10-10 13:25:12.144187524 +0200
@@ -382,4 +382,6 @@
SK_FloatNegativeInfinity,
SK_FloatNegativeInfinity,
SK_FloatNegativeInfinity };
+template <> uint32_t SkPMColor4f::toBytes_RGBA() const;
+
#endif // SkColorData_DEFINED
diff -ur skia.org/src/core/SkM44.cpp skia/src/core/SkM44.cpp
--- skia.org/src/core/SkM44.cpp 2024-10-10 13:25:03.659133538 +0200
+++ skia/src/core/SkM44.cpp 2024-10-10 13:25:12.144187524 +0200
@@ -340,6 +340,8 @@
return m;
}
+#undef near
+#undef far
SkM44 SkM44::Perspective(float near, float far, float angle) {
SkASSERT(far > near);
diff -ur skia.org/src/gpu/ganesh/vk/GrVkSemaphore.cpp skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp
--- skia.org/src/gpu/ganesh/vk/GrVkSemaphore.cpp 2024-10-10 13:25:03.679133665 +0200
+++ skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp 2024-10-10 13:25:12.144187524 +0200
@@ -12,6 +12,7 @@
#include "include/private/base/SkAssert.h"
#include "src/gpu/ganesh/vk/GrVkGpu.h"
#include "src/gpu/ganesh/vk/GrVkUtil.h"
+#include "tools/gpu/vk/GrVulkanDefines.h"
#include <string.h>
diff -ur skia.org/src/utils/win/SkDWriteGeometrySink.h skia/src/utils/win/SkDWriteGeometrySink.h
--- skia.org/src/utils/win/SkDWriteGeometrySink.h 2024-10-10 13:25:03.683133691 +0200
+++ skia/src/utils/win/SkDWriteGeometrySink.h 2024-10-10 13:25:12.144187524 +0200
@@ -13,6 +13,8 @@
class SkPath;
+#define CONST const
+
#include <dwrite.h>
#include <d2d1.h>
|
