Remove GrResourceProvider.h from all other header files
According to
https://commondatastorage.googleapis.com/chromium-browser-clang/include-analysis.html
these account for 583,146,886 bytes of input to the compiler, or roughly
0.25% of the input used to build Chrome.
Bug: chromium:242216
Change-Id: I2d5b73db770dba296df18c02a251da21e82b9ec0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/423836
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 4ba996e..0d43f90 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -16,6 +16,7 @@
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/GrTextureProxy.h"
diff --git a/src/gpu/GrDataUtils.cpp b/src/gpu/GrDataUtils.cpp
index af50a15..0d449d6 100644
--- a/src/gpu/GrDataUtils.cpp
+++ b/src/gpu/GrDataUtils.cpp
@@ -12,6 +12,7 @@
#include "src/core/SkColorSpaceXformSteps.h"
#include "src/core/SkCompressedDataUtils.h"
#include "src/core/SkConvertPixels.h"
+#include "src/core/SkMathPriv.h"
#include "src/core/SkMipmap.h"
#include "src/core/SkTLazy.h"
#include "src/core/SkTraceEvent.h"
diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index 6778668..3437044 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -358,7 +358,7 @@
deleteSemaphoresAfterWait ? kAdopt_GrWrapOwnership : kBorrow_GrWrapOwnership;
for (int i = 0; i < numSemaphores; ++i) {
std::unique_ptr<GrSemaphore> sema = fResourceProvider->wrapBackendSemaphore(
- waitSemaphores[i], GrResourceProvider::SemaphoreWrapType::kWillWait, ownership);
+ waitSemaphores[i], GrSemaphoreWrapType::kWillWait, ownership);
// If we failed to wrap the semaphore it means the client didn't give us a valid semaphore
// to begin with. Therefore, it is fine to not wait on it.
if (sema) {
diff --git a/src/gpu/GrDynamicAtlas.cpp b/src/gpu/GrDynamicAtlas.cpp
index 1b4cf24..916a338 100644
--- a/src/gpu/GrDynamicAtlas.cpp
+++ b/src/gpu/GrDynamicAtlas.cpp
@@ -13,6 +13,7 @@
#include "src/gpu/GrRectanizerPow2.h"
#include "src/gpu/GrRectanizerSkyline.h"
#include "src/gpu/GrRenderTarget.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceDrawContext.h"
// Each Node covers a sub-rectangle of the final atlas. When a GrDynamicAtlas runs out of room, we
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 4c2ba5e..3022526 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -616,7 +616,7 @@
if (info.fSignalSemaphores[i].isInitialized()) {
semaphores[i] = resourceProvider->wrapBackendSemaphore(
info.fSignalSemaphores[i],
- GrResourceProvider::SemaphoreWrapType::kWillSignal,
+ GrSemaphoreWrapType::kWillSignal,
kBorrow_GrWrapOwnership);
// If we failed to wrap the semaphore it means the client didn't give us a valid
// semaphore to begin with. Therefore, it is fine to not signal it.
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index fbe28a8..e0f93aa 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -382,8 +382,9 @@
virtual std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(
bool isOwned = true) = 0;
- virtual std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType, GrWrapOwnership ownership) = 0;
+ virtual std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore&,
+ GrSemaphoreWrapType,
+ GrWrapOwnership) = 0;
virtual void insertSemaphore(GrSemaphore* semaphore) = 0;
virtual void waitSemaphore(GrSemaphore* semaphore) = 0;
diff --git a/src/gpu/GrMeshDrawTarget.cpp b/src/gpu/GrMeshDrawTarget.cpp
new file mode 100644
index 0000000..cf1a0ff
--- /dev/null
+++ b/src/gpu/GrMeshDrawTarget.cpp
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/gpu/GrMeshDrawTarget.h"
+
+#include "src/gpu/GrResourceProvider.h"
+
+uint32_t GrMeshDrawTarget::contextUniqueID() const {
+ return this->resourceProvider()->contextUniqueID();
+}
diff --git a/src/gpu/GrMeshDrawTarget.h b/src/gpu/GrMeshDrawTarget.h
index 1caa788..a3065f7 100644
--- a/src/gpu/GrMeshDrawTarget.h
+++ b/src/gpu/GrMeshDrawTarget.h
@@ -11,6 +11,10 @@
#include "src/gpu/GrDrawIndirectCommand.h"
#include "src/gpu/GrSimpleMesh.h"
+class GrAtlasManager;
+class GrSmallPathAtlasMgr;
+class GrStrikeCache;
+
/*
* Abstract interface that supports creating vertices, indices, and meshes, as well as
* invoking GPU draw operations.
@@ -115,7 +119,7 @@
virtual GrThreadSafeCache* threadSafeCache() const = 0;
virtual GrResourceProvider* resourceProvider() const = 0;
- uint32_t contextUniqueID() const { return this->resourceProvider()->contextUniqueID(); }
+ uint32_t contextUniqueID() const;
virtual GrStrikeCache* strikeCache() const = 0;
virtual GrAtlasManager* atlasManager() const = 0;
diff --git a/src/gpu/GrOnFlushResourceProvider.cpp b/src/gpu/GrOnFlushResourceProvider.cpp
index 4bf29ac2..34232d6 100644
--- a/src/gpu/GrOnFlushResourceProvider.cpp
+++ b/src/gpu/GrOnFlushResourceProvider.cpp
@@ -13,6 +13,7 @@
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrTextureResolveRenderTask.h"
diff --git a/src/gpu/GrOnFlushResourceProvider.h b/src/gpu/GrOnFlushResourceProvider.h
index 31761bd..8ca47ee 100644
--- a/src/gpu/GrOnFlushResourceProvider.h
+++ b/src/gpu/GrOnFlushResourceProvider.h
@@ -13,7 +13,6 @@
#include "include/private/SkTArray.h"
#include "src/gpu/GrDeferredUpload.h"
#include "src/gpu/GrOpFlushState.h"
-#include "src/gpu/GrResourceProvider.h"
class GrDrawingManager;
class GrOnFlushResourceProvider;
diff --git a/src/gpu/GrOpsTask.cpp b/src/gpu/GrOpsTask.cpp
index e721f88..689a6a1 100644
--- a/src/gpu/GrOpsTask.cpp
+++ b/src/gpu/GrOpsTask.cpp
@@ -21,6 +21,7 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTarget.h"
#include "src/gpu/GrResourceAllocator.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/GrTexture.h"
#include "src/gpu/geometry/GrRect.h"
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index 6da85d6..fea11ad 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -676,7 +676,7 @@
std::unique_ptr<GrSemaphore> GrResourceProvider::wrapBackendSemaphore(
const GrBackendSemaphore& semaphore,
- SemaphoreWrapType wrapType,
+ GrSemaphoreWrapType wrapType,
GrWrapOwnership ownership) {
ASSERT_SINGLE_OWNER
return this->isAbandoned() ? nullptr : fGpu->wrapBackendSemaphore(semaphore,
diff --git a/src/gpu/GrResourceProvider.h b/src/gpu/GrResourceProvider.h
index f33f3204f..c1f46fd 100644
--- a/src/gpu/GrResourceProvider.h
+++ b/src/gpu/GrResourceProvider.h
@@ -10,7 +10,6 @@
#include "include/gpu/GrContextOptions.h"
#include "include/private/SkImageInfoPriv.h"
-#include "src/core/SkScalerContext.h"
#include "src/gpu/GrGpuBuffer.h"
#include "src/gpu/GrResourceCache.h"
@@ -312,13 +311,8 @@
std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned = true);
- enum class SemaphoreWrapType {
- kWillSignal,
- kWillWait,
- };
-
std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore&,
- SemaphoreWrapType wrapType,
+ GrSemaphoreWrapType,
GrWrapOwnership = kBorrow_GrWrapOwnership);
void abandon() {
diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index c1ad2e8..5c1c1a4 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -23,6 +23,7 @@
#include "src/gpu/GrImageInfo.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/GrSurfaceFillContext.h"
#include "src/gpu/SkGr.h"
diff --git a/src/gpu/GrSurfaceDrawContext.cpp b/src/gpu/GrSurfaceDrawContext.cpp
index 09b7dc1..c06d40d 100644
--- a/src/gpu/GrSurfaceDrawContext.cpp
+++ b/src/gpu/GrSurfaceDrawContext.cpp
@@ -1495,8 +1495,9 @@
std::unique_ptr<std::unique_ptr<GrSemaphore>[]> grSemaphores(
new std::unique_ptr<GrSemaphore>[numSemaphores]);
for (int i = 0; i < numSemaphores; ++i) {
- grSemaphores[i] = resourceProvider->wrapBackendSemaphore(
- waitSemaphores[i], GrResourceProvider::SemaphoreWrapType::kWillWait, ownership);
+ grSemaphores[i] = resourceProvider->wrapBackendSemaphore(waitSemaphores[i],
+ GrSemaphoreWrapType::kWillWait,
+ ownership);
}
this->drawingManager()->newWaitRenderTask(this->asSurfaceProxyRef(), std::move(grSemaphores),
numSemaphores);
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index f0eed7b..e5f9c2d 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -18,6 +18,7 @@
#include "src/gpu/GrOpsTask.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurface.h"
#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/GrTexture.h"
diff --git a/src/gpu/GrSurfaceProxyPriv.h b/src/gpu/GrSurfaceProxyPriv.h
index 9fe0d1a..467bc87 100644
--- a/src/gpu/GrSurfaceProxyPriv.h
+++ b/src/gpu/GrSurfaceProxyPriv.h
@@ -10,7 +10,7 @@
#include "src/gpu/GrSurfaceProxy.h"
-#include "src/gpu/GrResourceProvider.h"
+class GrResourceProvider;
/** Class that adds methods to GrSurfaceProxy that are only intended for use internal to Skia.
This class is purely a privileged window into GrSurfaceProxy. It should never have additional
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 477742d..949dcf1 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -13,6 +13,7 @@
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrRenderTarget.h"
+#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrTexture.h"
#ifdef SK_DEBUG
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp
index d7be2fe..8b5e107 100644
--- a/src/gpu/GrTextureProxy.cpp
+++ b/src/gpu/GrTextureProxy.cpp
@@ -11,6 +11,7 @@
#include "include/gpu/GrDirectContext.h"
#include "src/gpu/GrDeferredProxyUploader.h"
#include "src/gpu/GrDirectContextPriv.h"
+#include "src/gpu/GrGpuResourcePriv.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrSurface.h"
#include "src/gpu/GrTexture.h"
diff --git a/src/gpu/GrTransferFromRenderTask.cpp b/src/gpu/GrTransferFromRenderTask.cpp
index 0c679ed..ca44acc 100644
--- a/src/gpu/GrTransferFromRenderTask.cpp
+++ b/src/gpu/GrTransferFromRenderTask.cpp
@@ -10,6 +10,7 @@
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrResourceAllocator.h"
+#include "src/gpu/GrResourceProvider.h"
void GrTransferFromRenderTask::gatherProxyIntervals(GrResourceAllocator* alloc) const {
// This renderTask doesn't have "normal" ops. In this case we still need to add an interval (so
diff --git a/src/gpu/d3d/GrD3DGpu.cpp b/src/gpu/d3d/GrD3DGpu.cpp
index 5067b1b..f6707f9 100644
--- a/src/gpu/d3d/GrD3DGpu.cpp
+++ b/src/gpu/d3d/GrD3DGpu.cpp
@@ -1644,10 +1644,9 @@
std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT GrD3DGpu::makeSemaphore(bool) {
return GrD3DSemaphore::Make(this);
}
-std::unique_ptr<GrSemaphore> GrD3DGpu::wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType,
- GrWrapOwnership) {
+std::unique_ptr<GrSemaphore> GrD3DGpu::wrapBackendSemaphore(const GrBackendSemaphore& semaphore,
+ GrSemaphoreWrapType /* wrapType */,
+ GrWrapOwnership /* ownership */) {
SkASSERT(this->caps()->semaphoreSupport());
GrD3DFenceInfo fenceInfo;
if (!semaphore.getD3DFenceInfo(&fenceInfo)) {
diff --git a/src/gpu/d3d/GrD3DGpu.h b/src/gpu/d3d/GrD3DGpu.h
index 303eed1..3dacb3c 100644
--- a/src/gpu/d3d/GrD3DGpu.h
+++ b/src/gpu/d3d/GrD3DGpu.h
@@ -103,10 +103,9 @@
void deleteFence(GrFence) const override {}
std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned) override;
- std::unique_ptr<GrSemaphore> wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership ownership) override;
+ std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore&,
+ GrSemaphoreWrapType,
+ GrWrapOwnership) override;
void insertSemaphore(GrSemaphore* semaphore) override;
void waitSemaphore(GrSemaphore* semaphore) override;
std::unique_ptr<GrSemaphore> prepareTextureForCrossContextUsage(GrTexture*) override {
diff --git a/src/gpu/dawn/GrDawnGpu.cpp b/src/gpu/dawn/GrDawnGpu.cpp
index 44f3103..7e9bf25 100644
--- a/src/gpu/dawn/GrDawnGpu.cpp
+++ b/src/gpu/dawn/GrDawnGpu.cpp
@@ -821,10 +821,9 @@
return nullptr;
}
-std::unique_ptr<GrSemaphore> GrDawnGpu::wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership ownership) {
+std::unique_ptr<GrSemaphore> GrDawnGpu::wrapBackendSemaphore(const GrBackendSemaphore& /* sema */,
+ GrSemaphoreWrapType /* wrapType */,
+ GrWrapOwnership /* ownership */) {
SkASSERT(!"unimplemented");
return nullptr;
}
diff --git a/src/gpu/dawn/GrDawnGpu.h b/src/gpu/dawn/GrDawnGpu.h
index 4ceaf3f..df3a8fa 100644
--- a/src/gpu/dawn/GrDawnGpu.h
+++ b/src/gpu/dawn/GrDawnGpu.h
@@ -80,10 +80,9 @@
void deleteFence(GrFence) const override;
std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned = true) override;
- std::unique_ptr<GrSemaphore> wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership ownership) override;
+ std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore&,
+ GrSemaphoreWrapType,
+ GrWrapOwnership) override;
void insertSemaphore(GrSemaphore* semaphore) override;
void waitSemaphore(GrSemaphore* semaphore) override;
void checkFinishProcs() override;
diff --git a/src/gpu/effects/GrSkSLFP.h b/src/gpu/effects/GrSkSLFP.h
index 0e10876..ccf3c98 100644
--- a/src/gpu/effects/GrSkSLFP.h
+++ b/src/gpu/effects/GrSkSLFP.h
@@ -11,6 +11,7 @@
#include "include/core/SkRefCnt.h"
#include "include/effects/SkRuntimeEffect.h"
#include "include/gpu/GrContextOptions.h"
+#include "include/private/SkVx.h"
#include "src/gpu/GrFragmentProcessor.h"
#include <atomic>
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 533991d..a9152aa 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -4053,10 +4053,9 @@
return GrGLSemaphore::Make(this, isOwned);
}
-std::unique_ptr<GrSemaphore> GrGLGpu::wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership ownership) {
+std::unique_ptr<GrSemaphore> GrGLGpu::wrapBackendSemaphore(const GrBackendSemaphore& semaphore,
+ GrSemaphoreWrapType /* wrapType */,
+ GrWrapOwnership ownership) {
SkASSERT(this->caps()->semaphoreSupport());
return GrGLSemaphore::MakeWrapped(this, semaphore.glSync(), ownership);
}
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
index 03f98c7..42a41cb 100644
--- a/src/gpu/gl/GrGLGpu.h
+++ b/src/gpu/gl/GrGLGpu.h
@@ -173,10 +173,9 @@
void deleteFence(GrFence) const override;
std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned) override;
- std::unique_ptr<GrSemaphore> wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership ownership) override;
+ std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore&,
+ GrSemaphoreWrapType,
+ GrWrapOwnership) override;
void insertSemaphore(GrSemaphore* semaphore) override;
void waitSemaphore(GrSemaphore* semaphore) override;
diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index c5d6a3e..0aead27 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -12,6 +12,7 @@
#include "src/gpu/GrBackendUtils.h"
#include "src/gpu/GrDirectContextPriv.h"
#include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/gl/GrGLGpu.h"
#include "src/gpu/gl/GrGLUtil.h"
diff --git a/src/gpu/mock/GrMockCaps.cpp b/src/gpu/mock/GrMockCaps.cpp
index 7fefc0d..f332a05 100644
--- a/src/gpu/mock/GrMockCaps.cpp
+++ b/src/gpu/mock/GrMockCaps.cpp
@@ -7,8 +7,23 @@
#include "src/gpu/mock/GrMockCaps.h"
+#include "src/core/SkMathPriv.h"
#include "src/gpu/GrProgramDesc.h"
+int GrMockCaps::getRenderTargetSampleCount(int requestCount, GrColorType ct) const {
+ requestCount = std::max(requestCount, 1);
+
+ switch (fOptions.fConfigOptions[(int)ct].fRenderability) {
+ case GrMockOptions::ConfigOptions::Renderability::kNo:
+ return 0;
+ case GrMockOptions::ConfigOptions::Renderability::kNonMSAA:
+ return requestCount > 1 ? 0 : 1;
+ case GrMockOptions::ConfigOptions::Renderability::kMSAA:
+ return requestCount > kMaxSampleCnt ? 0 : GrNextPow2(requestCount);
+ }
+ return 0;
+}
+
GrProgramDesc GrMockCaps::makeDesc(GrRenderTarget* /* rt */,
const GrProgramInfo& programInfo,
ProgramDescOverrideFlags overrideFlags) const {
diff --git a/src/gpu/mock/GrMockCaps.h b/src/gpu/mock/GrMockCaps.h
index 0a06306..309f161 100644
--- a/src/gpu/mock/GrMockCaps.h
+++ b/src/gpu/mock/GrMockCaps.h
@@ -84,19 +84,7 @@
return sampleCount <= this->maxRenderTargetSampleCount(format.asMockColorType());
}
- int getRenderTargetSampleCount(int requestCount, GrColorType ct) const {
- requestCount = std::max(requestCount, 1);
-
- switch (fOptions.fConfigOptions[(int)ct].fRenderability) {
- case GrMockOptions::ConfigOptions::Renderability::kNo:
- return 0;
- case GrMockOptions::ConfigOptions::Renderability::kNonMSAA:
- return requestCount > 1 ? 0 : 1;
- case GrMockOptions::ConfigOptions::Renderability::kMSAA:
- return requestCount > kMaxSampleCnt ? 0 : GrNextPow2(requestCount);
- }
- return 0;
- }
+ int getRenderTargetSampleCount(int requestCount, GrColorType) const;
int getRenderTargetSampleCount(int requestCount,
const GrBackendFormat& format) const override {
diff --git a/src/gpu/mock/GrMockGpu.h b/src/gpu/mock/GrMockGpu.h
index 167632a..ffef787 100644
--- a/src/gpu/mock/GrMockGpu.h
+++ b/src/gpu/mock/GrMockGpu.h
@@ -34,10 +34,9 @@
std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned) override {
return nullptr;
}
- std::unique_ptr<GrSemaphore> wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership ownership) override {
+ std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore& /* semaphore */,
+ GrSemaphoreWrapType /* wraptype */,
+ GrWrapOwnership /* ownership */) override {
return nullptr;
}
void insertSemaphore(GrSemaphore* semaphore) override {}
diff --git a/src/gpu/mtl/GrMtlGpu.h b/src/gpu/mtl/GrMtlGpu.h
index 1ad730d..35c7ff4 100644
--- a/src/gpu/mtl/GrMtlGpu.h
+++ b/src/gpu/mtl/GrMtlGpu.h
@@ -96,10 +96,9 @@
void deleteFence(GrFence) const override;
std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned) override;
- std::unique_ptr<GrSemaphore> wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership ownership) override;
+ std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore&,
+ GrSemaphoreWrapType,
+ GrWrapOwnership) override;
void insertSemaphore(GrSemaphore* semaphore) override;
void waitSemaphore(GrSemaphore* semaphore) override;
void checkFinishProcs() override { this->checkForFinishedCommandBuffers(); }
diff --git a/src/gpu/mtl/GrMtlGpu.mm b/src/gpu/mtl/GrMtlGpu.mm
index 42d985d..829c639 100644
--- a/src/gpu/mtl/GrMtlGpu.mm
+++ b/src/gpu/mtl/GrMtlGpu.mm
@@ -10,11 +10,13 @@
#include "include/private/GrTypesPriv.h"
#include "src/core/SkCompressedDataUtils.h"
#include "src/core/SkConvertPixels.h"
+#include "src/core/SkMathPriv.h"
#include "src/core/SkMipmap.h"
#include "src/gpu/GrBackendUtils.h"
#include "src/gpu/GrDataUtils.h"
#include "src/gpu/GrDirectContextPriv.h"
#include "src/gpu/GrRenderTarget.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrTexture.h"
#include "src/gpu/GrThreadSafePipelineBuilder.h"
#include "src/gpu/mtl/GrMtlBuffer.h"
@@ -1511,10 +1513,9 @@
return GrMtlSemaphore::Make(this);
}
-std::unique_ptr<GrSemaphore> GrMtlGpu::wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership /*ownership*/) {
+std::unique_ptr<GrSemaphore> GrMtlGpu::wrapBackendSemaphore(const GrBackendSemaphore& semaphore,
+ GrSemaphoreWrapType /* wrapType */,
+ GrWrapOwnership /*ownership*/) {
SkASSERT(this->caps()->semaphoreSupport());
return GrMtlSemaphore::MakeWrapped(semaphore.mtlSemaphore(), semaphore.mtlValue());
}
diff --git a/src/gpu/mtl/GrMtlResourceProvider.h b/src/gpu/mtl/GrMtlResourceProvider.h
index 5e268d6..3d85386 100644
--- a/src/gpu/mtl/GrMtlResourceProvider.h
+++ b/src/gpu/mtl/GrMtlResourceProvider.h
@@ -11,6 +11,7 @@
#include "include/private/SkSpinlock.h"
#include "include/private/SkTArray.h"
#include "src/core/SkLRUCache.h"
+#include "src/core/SkTDynamicHash.h"
#include "src/gpu/GrProgramDesc.h"
#include "src/gpu/GrThreadSafePipelineBuilder.h"
#include "src/gpu/mtl/GrMtlDepthStencil.h"
diff --git a/src/gpu/ops/GrFillRRectOp.cpp b/src/gpu/ops/GrFillRRectOp.cpp
index 6251a79..32fd164 100644
--- a/src/gpu/ops/GrFillRRectOp.cpp
+++ b/src/gpu/ops/GrFillRRectOp.cpp
@@ -15,6 +15,7 @@
#include "src/gpu/GrOpsRenderPass.h"
#include "src/gpu/GrProgramInfo.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
#include "src/gpu/glsl/GrGLSLVarying.h"
diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index da42d40..47201cf 100644
--- a/src/gpu/ops/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
@@ -26,6 +26,15 @@
target->colorLoadOp());
}
+bool GrMeshDrawOp::CombinedQuadCountWillOverflow(GrAAType aaType,
+ bool willBeUpgradedToAA,
+ int combinedQuadCount) {
+ bool willBeAA = (aaType == GrAAType::kCoverage) || willBeUpgradedToAA;
+
+ return combinedQuadCount > (willBeAA ? GrResourceProvider::MaxNumAAQuads()
+ : GrResourceProvider::MaxNumNonAAQuads());
+}
+
// This onPrepareDraws implementation assumes the derived Op only has a single programInfo -
// which is the majority of the cases.
void GrMeshDrawOp::onPrePrepareDraws(GrRecordingContext* context,
diff --git a/src/gpu/ops/GrMeshDrawOp.h b/src/gpu/ops/GrMeshDrawOp.h
index 196adeb..05c11c1 100644
--- a/src/gpu/ops/GrMeshDrawOp.h
+++ b/src/gpu/ops/GrMeshDrawOp.h
@@ -94,12 +94,7 @@
static bool CombinedQuadCountWillOverflow(GrAAType aaType,
bool willBeUpgradedToAA,
- int combinedQuadCount) {
- bool willBeAA = (aaType == GrAAType::kCoverage) || willBeUpgradedToAA;
-
- return combinedQuadCount > (willBeAA ? GrResourceProvider::MaxNumAAQuads()
- : GrResourceProvider::MaxNumNonAAQuads());
- }
+ int combinedQuadCount);
virtual void onPrePrepareDraws(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
diff --git a/src/gpu/ops/GrQuadPerEdgeAA.cpp b/src/gpu/ops/GrQuadPerEdgeAA.cpp
index 307eb0a..f860406 100644
--- a/src/gpu/ops/GrQuadPerEdgeAA.cpp
+++ b/src/gpu/ops/GrQuadPerEdgeAA.cpp
@@ -9,6 +9,7 @@
#include "include/private/SkVx.h"
#include "src/gpu/GrMeshDrawTarget.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/geometry/GrQuadUtils.h"
#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
diff --git a/src/gpu/tessellate/GrDrawAtlasPathOp.cpp b/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
index eedcc51..b7a7b15 100644
--- a/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
+++ b/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
@@ -10,6 +10,7 @@
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrOpsRenderPass.h"
#include "src/gpu/GrProgramInfo.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrVertexWriter.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
diff --git a/src/gpu/tessellate/GrPathCurveTessellator.cpp b/src/gpu/tessellate/GrPathCurveTessellator.cpp
index 8f15368..bc796ec 100644
--- a/src/gpu/tessellate/GrPathCurveTessellator.cpp
+++ b/src/gpu/tessellate/GrPathCurveTessellator.cpp
@@ -7,6 +7,7 @@
#include "src/gpu/tessellate/GrPathCurveTessellator.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/geometry/GrWangsFormula.h"
#include "src/gpu/tessellate/GrCullTest.h"
diff --git a/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp b/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
index 376eaf2..e2463e5 100644
--- a/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
+++ b/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
@@ -12,6 +12,7 @@
#include "src/gpu/GrInnerFanTriangulator.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/glsl/GrGLSLProgramBuilder.h"
#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
#include "src/gpu/tessellate/GrPathCurveTessellator.h"
diff --git a/src/gpu/tessellate/GrPathStencilCoverOp.cpp b/src/gpu/tessellate/GrPathStencilCoverOp.cpp
index a8bc8c3..b68d96f 100644
--- a/src/gpu/tessellate/GrPathStencilCoverOp.cpp
+++ b/src/gpu/tessellate/GrPathStencilCoverOp.cpp
@@ -11,6 +11,7 @@
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/glsl/GrGLSLProgramBuilder.h"
#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
#include "src/gpu/tessellate/GrMiddleOutPolygonTriangulator.h"
diff --git a/src/gpu/tessellate/GrPathWedgeTessellator.cpp b/src/gpu/tessellate/GrPathWedgeTessellator.cpp
index 5dfa6cf..f311b2a 100644
--- a/src/gpu/tessellate/GrPathWedgeTessellator.cpp
+++ b/src/gpu/tessellate/GrPathWedgeTessellator.cpp
@@ -7,6 +7,7 @@
#include "src/gpu/tessellate/GrPathWedgeTessellator.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/geometry/GrWangsFormula.h"
#include "src/gpu/tessellate/GrCullTest.h"
diff --git a/src/gpu/tessellate/GrStrokeHardwareTessellator.cpp b/src/gpu/tessellate/GrStrokeHardwareTessellator.cpp
index a4d95f7..e87fa9c 100644
--- a/src/gpu/tessellate/GrStrokeHardwareTessellator.cpp
+++ b/src/gpu/tessellate/GrStrokeHardwareTessellator.cpp
@@ -7,6 +7,7 @@
#include "src/gpu/tessellate/GrStrokeHardwareTessellator.h"
+#include "src/core/SkMathPriv.h"
#include "src/core/SkPathPriv.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrVx.h"
@@ -702,6 +703,18 @@
} // namespace
+GrStrokeHardwareTessellator::GrStrokeHardwareTessellator(ShaderFlags shaderFlags,
+ const GrShaderCaps& shaderCaps,
+ const SkMatrix& viewMatrix,
+ PathStrokeList* pathStrokeList,
+ std::array<float,2> matrixMinMaxScales,
+ const SkRect& strokeCullBounds)
+ : GrStrokeTessellator(GrStrokeTessellationShader::Mode::kHardwareTessellation,
+ shaderFlags, SkNextLog2(shaderCaps.maxTessellationSegments()),
+ viewMatrix, pathStrokeList, matrixMinMaxScales,
+ strokeCullBounds) {
+}
+
void GrStrokeHardwareTessellator::prepare(GrMeshDrawTarget* target, int totalCombinedVerbCnt) {
using JoinType = PatchWriter::JoinType;
diff --git a/src/gpu/tessellate/GrStrokeHardwareTessellator.h b/src/gpu/tessellate/GrStrokeHardwareTessellator.h
index ccd76fc..cd413bb 100644
--- a/src/gpu/tessellate/GrStrokeHardwareTessellator.h
+++ b/src/gpu/tessellate/GrStrokeHardwareTessellator.h
@@ -18,13 +18,8 @@
public:
GrStrokeHardwareTessellator(ShaderFlags shaderFlags, const GrShaderCaps& shaderCaps,
const SkMatrix& viewMatrix, PathStrokeList* pathStrokeList,
- std::array<float,2> matrixMinMaxScales, const SkRect&
- strokeCullBounds)
- : GrStrokeTessellator(GrStrokeTessellationShader::Mode::kHardwareTessellation,
- shaderFlags, SkNextLog2(shaderCaps.maxTessellationSegments()),
- viewMatrix, pathStrokeList, matrixMinMaxScales,
- strokeCullBounds) {
- }
+ std::array<float,2> matrixMinMaxScales,
+ const SkRect& strokeCullBounds);
void prepare(GrMeshDrawTarget*, int totalCombinedVerbCnt) override;
void draw(GrOpFlushState*) const override;
diff --git a/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp b/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp
index 3e19c44..d2ff013 100644
--- a/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp
+++ b/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp
@@ -7,6 +7,7 @@
#include "src/gpu/tessellate/shaders/GrPathTessellationShader.h"
+#include "src/core/SkMathPriv.h"
#include "src/gpu/geometry/GrWangsFormula.h"
#include "src/gpu/glsl/GrGLSLProgramBuilder.h"
#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
diff --git a/src/gpu/text/GrAtlasManager.h b/src/gpu/text/GrAtlasManager.h
index 109d128..b9b91fe 100644
--- a/src/gpu/text/GrAtlasManager.h
+++ b/src/gpu/text/GrAtlasManager.h
@@ -14,6 +14,8 @@
#include "src/gpu/GrProxyProvider.h"
class GrGlyph;
+class GrResourceProvider;
+class SkGlyph;
class GrTextStrike;
//////////////////////////////////////////////////////////////////////////////////////////////////
@@ -48,11 +50,11 @@
// If bilerpPadding == true then addGlyphToAtlas adds a 1 pixel border to the glyph before
// inserting it into the atlas.
- GrDrawOpAtlas::ErrorCode addGlyphToAtlas(const SkGlyph& skGlyph,
- GrGlyph* grGlyph,
+ GrDrawOpAtlas::ErrorCode addGlyphToAtlas(const SkGlyph&,
+ GrGlyph*,
int srcPadding,
- GrResourceProvider* resourceProvider,
- GrDeferredUploadTarget* uploadTarget,
+ GrResourceProvider*,
+ GrDeferredUploadTarget*,
bool bilerpPadding = false);
// To ensure the GrDrawOpAtlas does not evict the Glyph Mask from its texture backing store,
diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 0769447..852926f 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -19,6 +19,7 @@
#include "src/core/SkOpts.h"
#include "src/core/SkRectPriv.h"
#include "src/core/SkStrikeSpec.h"
+#include "src/core/SkTLList.h"
#include "src/core/SkTLazy.h"
#include "src/gpu/GrColor.h"
#include "src/gpu/GrSubRunAllocator.h"
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index b606529..60f64af 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -23,6 +23,7 @@
#include "src/gpu/GrNativeRect.h"
#include "src/gpu/GrPipeline.h"
#include "src/gpu/GrRenderTarget.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/GrTexture.h"
#include "src/gpu/GrThreadSafePipelineBuilder.h"
@@ -2555,10 +2556,9 @@
return GrVkSemaphore::Make(this, isOwned);
}
-std::unique_ptr<GrSemaphore> GrVkGpu::wrapBackendSemaphore(
- const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType,
- GrWrapOwnership ownership) {
+std::unique_ptr<GrSemaphore> GrVkGpu::wrapBackendSemaphore(const GrBackendSemaphore& semaphore,
+ GrSemaphoreWrapType wrapType,
+ GrWrapOwnership ownership) {
return GrVkSemaphore::MakeWrapped(this, semaphore.vkSemaphore(), wrapType, ownership);
}
diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h
index d355c68..9b23f52 100644
--- a/src/gpu/vk/GrVkGpu.h
+++ b/src/gpu/vk/GrVkGpu.h
@@ -154,8 +154,9 @@
void deleteFence(GrFence) const override;
std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned) override;
- std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore& semaphore,
- GrResourceProvider::SemaphoreWrapType wrapType, GrWrapOwnership ownership) override;
+ std::unique_ptr<GrSemaphore> wrapBackendSemaphore(const GrBackendSemaphore&,
+ GrSemaphoreWrapType,
+ GrWrapOwnership) override;
void insertSemaphore(GrSemaphore* semaphore) override;
void waitSemaphore(GrSemaphore* semaphore) override;
diff --git a/src/gpu/vk/GrVkMSAALoadManager.cpp b/src/gpu/vk/GrVkMSAALoadManager.cpp
index 4888e73..6f3d773 100644
--- a/src/gpu/vk/GrVkMSAALoadManager.cpp
+++ b/src/gpu/vk/GrVkMSAALoadManager.cpp
@@ -10,6 +10,7 @@
#include "include/gpu/GrDirectContext.h"
#include "src/core/SkTraceEvent.h"
#include "src/gpu/GrDirectContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/vk/GrVkBuffer.h"
#include "src/gpu/vk/GrVkCommandBuffer.h"
#include "src/gpu/vk/GrVkDescriptorSet.h"
diff --git a/src/gpu/vk/GrVkSemaphore.cpp b/src/gpu/vk/GrVkSemaphore.cpp
index 23bf656..21e336e 100644
--- a/src/gpu/vk/GrVkSemaphore.cpp
+++ b/src/gpu/vk/GrVkSemaphore.cpp
@@ -35,14 +35,14 @@
std::unique_ptr<GrVkSemaphore> GrVkSemaphore::MakeWrapped(GrVkGpu* gpu,
VkSemaphore semaphore,
- WrapType wrapType,
+ GrSemaphoreWrapType wrapType,
GrWrapOwnership ownership) {
if (VK_NULL_HANDLE == semaphore) {
SkDEBUGFAIL("Trying to wrap an invalid VkSemaphore");
return nullptr;
}
- bool prohibitSignal = WrapType::kWillWait == wrapType;
- bool prohibitWait = WrapType::kWillSignal == wrapType;
+ bool prohibitSignal = GrSemaphoreWrapType::kWillWait == wrapType;
+ bool prohibitWait = GrSemaphoreWrapType::kWillSignal == wrapType;
return std::unique_ptr<GrVkSemaphore>(new GrVkSemaphore(gpu, semaphore, prohibitSignal,
prohibitWait,
kBorrow_GrWrapOwnership != ownership));
diff --git a/src/gpu/vk/GrVkSemaphore.h b/src/gpu/vk/GrVkSemaphore.h
index f7c2183..14bfce7 100644
--- a/src/gpu/vk/GrVkSemaphore.h
+++ b/src/gpu/vk/GrVkSemaphore.h
@@ -11,7 +11,6 @@
#include "src/gpu/GrSemaphore.h"
#include "include/gpu/vk/GrVkTypes.h"
-#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/vk/GrVkManagedResource.h"
#include <cinttypes>
@@ -23,11 +22,9 @@
public:
static std::unique_ptr<GrVkSemaphore> Make(GrVkGpu* gpu, bool isOwned);
- using WrapType = GrResourceProvider::SemaphoreWrapType;
-
- static std::unique_ptr<GrVkSemaphore> MakeWrapped(GrVkGpu* gpu,
- VkSemaphore semaphore,
- WrapType wrapType,
+ static std::unique_ptr<GrVkSemaphore> MakeWrapped(GrVkGpu*,
+ VkSemaphore,
+ GrSemaphoreWrapType,
GrWrapOwnership);
~GrVkSemaphore() override;
diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp
index c525201..faf191e 100644
--- a/src/image/SkImage_GpuBase.cpp
+++ b/src/image/SkImage_GpuBase.cpp
@@ -20,6 +20,7 @@
#include "src/gpu/GrImageInfo.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/GrTexture.h"
#include "src/gpu/GrYUVATextureProxies.h"
@@ -297,10 +298,10 @@
return {};
}
- sk_sp<GrTexture> tex= resourceProvider->wrapBackendTexture(backendTexture,
- kBorrow_GrWrapOwnership,
- GrWrapCacheable::kNo,
- kRead_GrIOType);
+ sk_sp<GrTexture> tex = resourceProvider->wrapBackendTexture(backendTexture,
+ kBorrow_GrWrapOwnership,
+ GrWrapCacheable::kNo,
+ kRead_GrIOType);
if (!tex) {
return {};
}