Skip to content

Commit 2e75b61

Browse files
committed
Patch m149 D3D release build
1 parent 7eecb8a commit 2e75b61

1 file changed

Lines changed: 36 additions & 0 deletions

File tree

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff --git a/src/gpu/ganesh/d3d/GrD3DBackendSurface.cpp b/src/gpu/ganesh/d3d/GrD3DBackendSurface.cpp
2+
index 8d20c4fbda..e4d94b0c76 100644
3+
--- a/src/gpu/ganesh/d3d/GrD3DBackendSurface.cpp
4+
+++ b/src/gpu/ganesh/d3d/GrD3DBackendSurface.cpp
5+
@@ -39,7 +39,6 @@ private:
6+
7+
GrColorFormatDesc desc() const override { return GrDxgiFormatDesc(fFormat); }
8+
9+
-#if defined(GPU_TEST_UTILS)
10+
bool equal(const GrBackendFormatData* that) const override {
11+
SkASSERT(!that || that->type() == GrBackendApi::kDirect3D);
12+
if (auto otherD3D = static_cast<const GrD3DBackendFormatData*>(that)) {
13+
@@ -47,7 +46,6 @@ private:
14+
}
15+
return false;
16+
}
17+
-#endif
18+
19+
std::string toString() const override {
20+
#if defined(SK_DEBUG) || defined(GPU_TEST_UTILS)
21+
@@ -114,6 +112,7 @@ private:
22+
23+
bool isProtected() const override { return false; }
24+
25+
+#if defined(GPU_TEST_UTILS)
26+
bool equal(const GrBackendTextureData* that) const override {
27+
SkASSERT(!that || that->type() == GrBackendApi::kDirect3D);
28+
#if defined(GPU_TEST_UTILS)
29+
@@ -123,6 +122,7 @@ private:
30+
#endif
31+
return false;
32+
}
33+
+#endif
34+
35+
bool isSameTexture(const GrBackendTextureData* that) const override {
36+
SkASSERT(!that || that->type() == GrBackendApi::kDirect3D);

0 commit comments

Comments
 (0)