Move GrBackend enum to enum class.
Bug: skia:
Change-Id: I8add2470313549723be6720b543091c444d2eb4f
Reviewed-on: https://skia-review.googlesource.com/c/161680
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp
index 84f31c9..6971612 100644
--- a/src/core/SkDeferredDisplayListRecorder.cpp
+++ b/src/core/SkDeferredDisplayListRecorder.cpp
@@ -105,7 +105,7 @@
bool usesGLFBO0 = fCharacterization.usesGLFBO0();
if (usesGLFBO0) {
- if (kOpenGL_GrBackend != fContext->contextPriv().getBackend() ||
+ if (GrBackendApi::kOpenGL != fContext->contextPriv().getBackend() ||
fCharacterization.isTextureable()) {
return false;
}
diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/GrAHardwareBufferImageGenerator.cpp
index afde089..76918de 100644
--- a/src/gpu/GrAHardwareBufferImageGenerator.cpp
+++ b/src/gpu/GrAHardwareBufferImageGenerator.cpp
@@ -55,7 +55,7 @@
}
static bool can_import_protected_content(GrContext* context) {
- if (kOpenGL_GrBackend == context->contextPriv().getBackend()) {
+ if (GrBackendApi::kOpenGL == context->contextPriv().getBackend()) {
// Only compute whether the extension is present once the first time this
// function is called.
static bool hasIt = can_import_protected_content_eglimpl();
@@ -156,7 +156,7 @@
GrAHardwareBufferImageGenerator::DeleteImageCtx* deleteCtx,
bool isProtectedContent,
const GrBackendFormat& backendFormat) {
- SkASSERT(context->contextPriv().getBackend() == kVulkan_GrBackend);
+ SkASSERT(context->contextPriv().getBackend() == GrBackendApi::kVulkan);
GrVkGpu* gpu = static_cast<GrVkGpu*>(context->contextPriv().getGpu());
VkPhysicalDevice physicalDevice = gpu->physicalDevice();
@@ -422,11 +422,11 @@
}
bool createProtectedImage = isProtectedContent && can_import_protected_content(context);
- if (kOpenGL_GrBackend == context->contextPriv().getBackend()) {
+ if (GrBackendApi::kOpenGL == context->contextPriv().getBackend()) {
return make_gl_backend_texture(context, hardwareBuffer, width, height, config, deleteProc,
deleteCtx, createProtectedImage, backendFormat);
} else {
- SkASSERT(kVulkan_GrBackend == context->contextPriv().getBackend());
+ SkASSERT(GrBackendApi::kVulkan == context->contextPriv().getBackend());
#ifdef SK_VULKAN
// Currently we don't support protected images on vulkan
SkASSERT(!createProtectedImage);
@@ -438,8 +438,8 @@
}
}
-GrBackendFormat get_backend_format(GrBackend backend, uint32_t bufferFormat) {
- if (backend == kOpenGL_GrBackend) {
+GrBackendFormat get_backend_format(GrBackendApi backend, uint32_t bufferFormat) {
+ if (backend == GrBackendApi::kOpenGL) {
switch (bufferFormat) {
//TODO: find out if we can detect, which graphic buffers support GR_GL_TEXTURE_2D
case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
@@ -456,7 +456,7 @@
default:
return GrBackendFormat::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
}
- } else if (backend == kVulkan_GrBackend) {
+ } else if (backend == GrBackendApi::kVulkan) {
switch (bufferFormat) {
//TODO: find out if we can detect, which graphic buffers support GR_GL_TEXTURE_2D
case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
@@ -500,7 +500,7 @@
desc.fConfig = pixelConfig;
GrTextureType textureType = GrTextureType::k2D;
- if (context->contextPriv().getBackend() == kOpenGL_GrBackend) {
+ if (context->contextPriv().getBackend() == GrBackendApi::kOpenGL) {
textureType = GrTextureType::kExternal;
}
@@ -582,8 +582,8 @@
if (nullptr == context) {
return false; //CPU backend is not supported, because hardware buffer can be swizzled
}
- return kOpenGL_GrBackend == context->contextPriv().getBackend() ||
- kVulkan_GrBackend == context->contextPriv().getBackend();
+ return GrBackendApi::kOpenGL == context->contextPriv().getBackend() ||
+ GrBackendApi::kVulkan == context->contextPriv().getBackend();
}
#endif //SK_BUILD_FOR_ANDROID_FRAMEWORK
diff --git a/src/gpu/GrBackendSurface.cpp b/src/gpu/GrBackendSurface.cpp
index 0e6df50..8198d52 100644
--- a/src/gpu/GrBackendSurface.cpp
+++ b/src/gpu/GrBackendSurface.cpp
@@ -19,28 +19,28 @@
#endif
GrBackendFormat::GrBackendFormat(GrGLenum format, GrGLenum target)
- : fBackend(kOpenGL_GrBackend)
+ : fBackend(GrBackendApi::kOpenGL)
, fValid(true) {
fGL.fTarget = target;
fGL.fFormat = format;
}
const GrGLenum* GrBackendFormat::getGLFormat() const {
- if (this->isValid() && kOpenGL_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kOpenGL == fBackend) {
return &fGL.fFormat;
}
return nullptr;
}
const GrGLenum* GrBackendFormat::getGLTarget() const {
- if (this->isValid() && kOpenGL_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kOpenGL == fBackend) {
return &fGL.fTarget;
}
return nullptr;
}
GrBackendFormat::GrBackendFormat(VkFormat vkFormat)
- : fBackend(kVulkan_GrBackend)
+ : fBackend(GrBackendApi::kVulkan)
#ifdef SK_VULKAN
, fValid(true)
#else
@@ -50,7 +50,7 @@
}
const VkFormat* GrBackendFormat::getVkFormat() const {
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
return &fVkFormat;
}
return nullptr;
@@ -58,13 +58,13 @@
#ifdef SK_METAL
GrBackendFormat::GrBackendFormat(GrMTLPixelFormat mtlFormat)
- : fBackend(kMetal_GrBackend)
+ : fBackend(GrBackendApi::kMetal)
, fValid(true)
, fMtlFormat(mtlFormat) {
}
const GrMTLPixelFormat* GrBackendFormat::getMtlFormat() const {
- if (this->isValid() && kMetal_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kMetal == fBackend) {
return &fMtlFormat;
}
return nullptr;
@@ -72,13 +72,13 @@
#endif
GrBackendFormat::GrBackendFormat(GrPixelConfig config)
- : fBackend(kMock_GrBackend)
+ : fBackend(GrBackendApi::kMock)
, fValid(true)
, fMockFormat(config) {
}
const GrPixelConfig* GrBackendFormat::getMockFormat() const {
- if (this->isValid() && kMock_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kMock == fBackend) {
return &fMockFormat;
}
return nullptr;
@@ -104,7 +104,7 @@
, fHeight(height)
, fConfig(kUnknown_GrPixelConfig)
, fMipMapped(GrMipMapped(vkInfo.fLevelCount > 1))
- , fBackend(kVulkan_GrBackend)
+ , fBackend(GrBackendApi::kVulkan)
, fVkInfo(vkInfo, layout.release()) {
}
#endif
@@ -119,7 +119,7 @@
, fHeight(height)
, fConfig(GrPixelConfig::kUnknown_GrPixelConfig)
, fMipMapped(mipMapped)
- , fBackend(kMetal_GrBackend)
+ , fBackend(GrBackendApi::kMetal)
, fMtlInfo(mtlInfo) {}
#endif
@@ -132,7 +132,7 @@
, fHeight(height)
, fConfig(kUnknown_GrPixelConfig)
, fMipMapped(mipMapped)
- , fBackend(kOpenGL_GrBackend)
+ , fBackend(GrBackendApi::kOpenGL)
, fGLInfo(glInfo) {}
GrBackendTexture::GrBackendTexture(int width,
@@ -144,7 +144,7 @@
, fHeight(height)
, fConfig(mockInfo.fConfig)
, fMipMapped(mipMapped)
- , fBackend(kMock_GrBackend)
+ , fBackend(GrBackendApi::kMock)
, fMockInfo(mockInfo) {}
GrBackendTexture::~GrBackendTexture() {
@@ -153,7 +153,7 @@
void GrBackendTexture::cleanup() {
#ifdef SK_VULKAN
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
fVkInfo.cleanup();
}
#endif
@@ -176,20 +176,20 @@
fBackend = that.fBackend;
switch (that.fBackend) {
- case kOpenGL_GrBackend:
+ case GrBackendApi::kOpenGL:
fGLInfo = that.fGLInfo;
break;
- case kVulkan_GrBackend:
+ case GrBackendApi::kVulkan:
#ifdef SK_VULKAN
fVkInfo.assign(that.fVkInfo, this->isValid());
#endif
break;
#ifdef SK_METAL
- case kMetal_GrBackend:
+ case GrBackendApi::kMetal:
fMtlInfo = that.fMtlInfo;
break;
#endif
- case kMock_GrBackend:
+ case GrBackendApi::kMock:
fMockInfo = that.fMockInfo;
break;
default:
@@ -201,7 +201,7 @@
bool GrBackendTexture::getVkImageInfo(GrVkImageInfo* outInfo) const {
#ifdef SK_VULKAN
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
*outInfo = fVkInfo.snapImageInfo();
return true;
}
@@ -211,7 +211,7 @@
void GrBackendTexture::setVkImageLayout(VkImageLayout layout) {
#ifdef SK_VULKAN
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
fVkInfo.setImageLayout(layout);
}
#endif
@@ -226,7 +226,7 @@
sk_sp<GrVkImageLayout> GrBackendTexture::getGrVkImageLayout() const {
#ifdef SK_VULKAN
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
return fVkInfo.getGrVkImageLayout();
}
#endif
@@ -235,7 +235,7 @@
#ifdef SK_METAL
bool GrBackendTexture::getMtlTextureInfo(GrMtlTextureInfo* outInfo) const {
- if (this->isValid() && kMetal_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kMetal == fBackend) {
*outInfo = fMtlInfo;
return true;
}
@@ -244,7 +244,7 @@
#endif
bool GrBackendTexture::getGLTextureInfo(GrGLTextureInfo* outInfo) const {
- if (this->isValid() && kOpenGL_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kOpenGL == fBackend) {
*outInfo = fGLInfo;
return true;
}
@@ -252,7 +252,7 @@
}
bool GrBackendTexture::getMockTextureInfo(GrMockTextureInfo* outInfo) const {
- if (this->isValid() && kMock_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kMock == fBackend) {
*outInfo = fMockInfo;
return true;
}
@@ -274,17 +274,17 @@
}
switch (t0.fBackend) {
- case kOpenGL_GrBackend:
+ case GrBackendApi::kOpenGL:
return t0.fGLInfo == t1.fGLInfo;
- case kMock_GrBackend:
+ case GrBackendApi::kMock:
return t0.fMockInfo == t1.fMockInfo;
- case kVulkan_GrBackend:
+ case GrBackendApi::kVulkan:
#ifdef SK_VULKAN
return t0.fVkInfo == t1.fVkInfo;
#else
// fall through
#endif
- case kMetal_GrBackend:
+ case GrBackendApi::kMetal:
#ifdef SK_METAL
return t0.fMtlInfo == t1.fMtlInfo;
#else
@@ -334,7 +334,7 @@
, fSampleCnt(SkTMax(1, sampleCnt))
, fStencilBits(0) // We always create stencil buffers internally for vulkan
, fConfig(kUnknown_GrPixelConfig)
- , fBackend(kVulkan_GrBackend)
+ , fBackend(GrBackendApi::kVulkan)
, fVkInfo(vkInfo, layout.release()) {}
#endif
@@ -349,7 +349,7 @@
, fSampleCnt(SkTMax(1, sampleCnt))
, fStencilBits(0)
, fConfig(GrPixelConfig::kUnknown_GrPixelConfig)
- , fBackend(kMetal_GrBackend)
+ , fBackend(GrBackendApi::kMetal)
, fMtlInfo(mtlInfo) {}
#endif
@@ -364,7 +364,7 @@
, fSampleCnt(SkTMax(1, sampleCnt))
, fStencilBits(stencilBits)
, fConfig(kUnknown_GrPixelConfig)
- , fBackend(kOpenGL_GrBackend)
+ , fBackend(GrBackendApi::kOpenGL)
, fGLInfo(glInfo) {}
GrBackendRenderTarget::GrBackendRenderTarget(int width,
@@ -386,7 +386,7 @@
void GrBackendRenderTarget::cleanup() {
#ifdef SK_VULKAN
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
fVkInfo.cleanup();
}
#endif
@@ -410,20 +410,20 @@
fBackend = that.fBackend;
switch (that.fBackend) {
- case kOpenGL_GrBackend:
+ case GrBackendApi::kOpenGL:
fGLInfo = that.fGLInfo;
break;
- case kVulkan_GrBackend:
+ case GrBackendApi::kVulkan:
#ifdef SK_VULKAN
fVkInfo.assign(that.fVkInfo, this->isValid());
#endif
break;
#ifdef SK_METAL
- case kMetal_GrBackend:
+ case GrBackendApi::kMetal:
fMtlInfo = that.fMtlInfo;
break;
#endif
- case kMock_GrBackend:
+ case GrBackendApi::kMock:
fMockInfo = that.fMockInfo;
break;
default:
@@ -435,7 +435,7 @@
bool GrBackendRenderTarget::getVkImageInfo(GrVkImageInfo* outInfo) const {
#ifdef SK_VULKAN
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
*outInfo = fVkInfo.snapImageInfo();
return true;
}
@@ -445,7 +445,7 @@
void GrBackendRenderTarget::setVkImageLayout(VkImageLayout layout) {
#ifdef SK_VULKAN
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
fVkInfo.setImageLayout(layout);
}
#endif
@@ -453,7 +453,7 @@
sk_sp<GrVkImageLayout> GrBackendRenderTarget::getGrVkImageLayout() const {
#ifdef SK_VULKAN
- if (this->isValid() && kVulkan_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
return fVkInfo.getGrVkImageLayout();
}
#endif
@@ -462,7 +462,7 @@
#ifdef SK_METAL
bool GrBackendRenderTarget::getMtlTextureInfo(GrMtlTextureInfo* outInfo) const {
- if (this->isValid() && kMetal_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kMetal == fBackend) {
*outInfo = fMtlInfo;
return true;
}
@@ -471,7 +471,7 @@
#endif
bool GrBackendRenderTarget::getGLFramebufferInfo(GrGLFramebufferInfo* outInfo) const {
- if (this->isValid() && kOpenGL_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kOpenGL == fBackend) {
*outInfo = fGLInfo;
return true;
}
@@ -479,7 +479,7 @@
}
bool GrBackendRenderTarget::getMockRenderTargetInfo(GrMockRenderTargetInfo* outInfo) const {
- if (this->isValid() && kMock_GrBackend == fBackend) {
+ if (this->isValid() && GrBackendApi::kMock == fBackend) {
*outInfo = fMockInfo;
return true;
}
@@ -503,17 +503,17 @@
}
switch (r0.fBackend) {
- case kOpenGL_GrBackend:
+ case GrBackendApi::kOpenGL:
return r0.fGLInfo == r1.fGLInfo;
- case kMock_GrBackend:
+ case GrBackendApi::kMock:
return r0.fMockInfo == r1.fMockInfo;
- case kVulkan_GrBackend:
+ case GrBackendApi::kVulkan:
#ifdef SK_VULKAN
return r0.fVkInfo == r1.fVkInfo;
#else
// fall through
#endif
- case kMetal_GrBackend:
+ case GrBackendApi::kMetal:
#ifdef SK_METAL
return r0.fMtlInfo == r1.fMtlInfo;
#else
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 596fa66..487dfe8 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -66,7 +66,7 @@
return id;
}
-GrContext::GrContext(GrBackend backend, int32_t id)
+GrContext::GrContext(GrBackendApi backend, int32_t id)
: fBackend(backend)
, fUniqueID(SK_InvalidGenID == id ? next_id() : id) {
fResourceCache = nullptr;
@@ -168,7 +168,7 @@
//////////////////////////////////////////////////////////////////////////////
GrContextThreadSafeProxy::GrContextThreadSafeProxy(sk_sp<const GrCaps> caps, uint32_t uniqueID,
- GrBackend backend,
+ GrBackendApi backend,
const GrContextOptions& options,
sk_sp<GrSkSLFPFactoryCache> cache)
: fCaps(std::move(caps))
@@ -193,7 +193,7 @@
return SkSurfaceCharacterization(); // return an invalid characterization
}
- if (kOpenGL_GrBackend != backendFormat.backend() && willUseGLFBO0) {
+ if (GrBackendApi::kOpenGL != backendFormat.backend() && willUseGLFBO0) {
// The willUseGLFBO0 flags can only be used for a GL backend.
return SkSurfaceCharacterization(); // return an invalid characterization
}
@@ -1129,11 +1129,11 @@
"Vulkan",
"Mock",
};
- GR_STATIC_ASSERT(0 == kMetal_GrBackend);
- GR_STATIC_ASSERT(1 == kOpenGL_GrBackend);
- GR_STATIC_ASSERT(2 == kVulkan_GrBackend);
- GR_STATIC_ASSERT(3 == kMock_GrBackend);
- writer.appendString("backend", kBackendStr[fContext->fBackend]);
+ GR_STATIC_ASSERT(0 == (unsigned)GrBackendApi::kMetal);
+ GR_STATIC_ASSERT(1 == (unsigned)GrBackendApi::kOpenGL);
+ GR_STATIC_ASSERT(2 == (unsigned)GrBackendApi::kVulkan);
+ GR_STATIC_ASSERT(3 == (unsigned)GrBackendApi::kMock);
+ writer.appendString("backend", kBackendStr[(unsigned)fContext->fBackend]);
writer.appendName("caps");
fContext->fCaps->dumpJSON(&writer);
diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h
index afb3949..ba7b0cf 100644
--- a/src/gpu/GrContextPriv.h
+++ b/src/gpu/GrContextPriv.h
@@ -177,7 +177,7 @@
GrColorType srcColorType, SkColorSpace* srcColorSpace,
const void* buffer, size_t rowBytes, uint32_t pixelOpsFlags = 0);
- GrBackend getBackend() const { return fContext->fBackend; }
+ GrBackendApi getBackend() const { return fContext->fBackend; }
SkTaskGroup* getTaskGroup() { return fContext->fTaskGroup.get(); }
diff --git a/src/gpu/GrContextThreadSafeProxyPriv.h b/src/gpu/GrContextThreadSafeProxyPriv.h
index b3a4eab..1d251e4 100644
--- a/src/gpu/GrContextThreadSafeProxyPriv.h
+++ b/src/gpu/GrContextThreadSafeProxyPriv.h
@@ -22,7 +22,7 @@
const GrCaps* caps() const { return fProxy->fCaps.get(); }
sk_sp<const GrCaps> refCaps() const { return fProxy->fCaps; }
uint32_t contextUniqueID() const { return fProxy->fContextUniqueID; }
- GrBackend backend() const { return fProxy->fBackend; }
+ GrBackendApi backend() const { return fProxy->fBackend; }
sk_sp<GrSkSLFPFactoryCache> fpFactoryCache() const { return fProxy->fFPFactoryCache; }
private:
diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index 59b984c..c5acb50 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -23,7 +23,7 @@
class SK_API GrDirectContext : public GrContext {
public:
- GrDirectContext(GrBackend backend)
+ GrDirectContext(GrBackendApi backend)
: INHERITED(backend)
, fAtlasManager(nullptr) {
}
@@ -112,7 +112,7 @@
sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> interface,
const GrContextOptions& options) {
- sk_sp<GrContext> context(new GrDirectContext(kOpenGL_GrBackend));
+ sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kOpenGL));
context->fGpu = GrGLGpu::Make(std::move(interface), options, context.get());
if (!context->fGpu) {
@@ -133,7 +133,7 @@
sk_sp<GrContext> GrContext::MakeMock(const GrMockOptions* mockOptions,
const GrContextOptions& options) {
- sk_sp<GrContext> context(new GrDirectContext(kMock_GrBackend));
+ sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kMock));
context->fGpu = GrMockGpu::Make(mockOptions, options, context.get());
if (!context->fGpu) {
@@ -160,7 +160,7 @@
const GrContextOptions& options) {
#ifdef SK_VULKAN
GrContextOptions defaultOptions;
- sk_sp<GrContext> context(new GrDirectContext(kVulkan_GrBackend));
+ sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kVulkan));
context->fGpu = GrVkGpu::Make(backendContext, options, context.get());
if (!context->fGpu) {
@@ -184,7 +184,7 @@
}
sk_sp<GrContext> GrContext::MakeMetal(void* device, void* queue, const GrContextOptions& options) {
- sk_sp<GrContext> context(new GrDirectContext(kMetal_GrBackend));
+ sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kMetal));
context->fGpu = GrMtlTrampoline::MakeGpu(context.get(), options, device, queue);
if (!context->fGpu) {
diff --git a/src/gpu/GrNonAtomicRef.h b/src/gpu/GrNonAtomicRef.h
index 5a4e8d1..d554755 100644
--- a/src/gpu/GrNonAtomicRef.h
+++ b/src/gpu/GrNonAtomicRef.h
@@ -13,7 +13,7 @@
#include "SkTArray.h"
/**
- * A simple non-atomic ref used in the GrBackend when we don't want to pay for the overhead of a
+ * A simple non-atomic ref used in the GrBackendApi when we don't want to pay for the overhead of a
* threadsafe ref counted object
*/
template<typename TSubclass> class GrNonAtomicRef : public SkNoncopyable {
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 3bc7d3a..d5a8d42 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -4025,7 +4025,7 @@
}
bool GrGLGpu::isTestingOnlyBackendTexture(const GrBackendTexture& tex) const {
- SkASSERT(kOpenGL_GrBackend == tex.backend());
+ SkASSERT(GrBackendApi::kOpenGL == tex.backend());
GrGLTextureInfo info;
if (!tex.getGLTextureInfo(&info)) {
@@ -4039,7 +4039,7 @@
}
void GrGLGpu::deleteTestingOnlyBackendTexture(const GrBackendTexture& tex) {
- SkASSERT(kOpenGL_GrBackend == tex.backend());
+ SkASSERT(GrBackendApi::kOpenGL == tex.backend());
GrGLTextureInfo info;
if (tex.getGLTextureInfo(&info)) {
@@ -4165,7 +4165,7 @@
}
void GrGLGpu::deleteTestingOnlyBackendRenderTarget(const GrBackendRenderTarget& backendRT) {
- SkASSERT(kOpenGL_GrBackend == backendRT.backend());
+ SkASSERT(GrBackendApi::kOpenGL == backendRT.backend());
GrGLFramebufferInfo info;
if (backendRT.getGLFramebufferInfo(&info)) {
if (info.fFBOID) {
diff --git a/src/gpu/mock/GrMockGpu.cpp b/src/gpu/mock/GrMockGpu.cpp
index ac3e5ca..8a8aee6 100644
--- a/src/gpu/mock/GrMockGpu.cpp
+++ b/src/gpu/mock/GrMockGpu.cpp
@@ -209,7 +209,7 @@
}
bool GrMockGpu::isTestingOnlyBackendTexture(const GrBackendTexture& tex) const {
- SkASSERT(kMock_GrBackend == tex.backend());
+ SkASSERT(GrBackendApi::kMock == tex.backend());
GrMockTextureInfo info;
if (!tex.getMockTextureInfo(&info)) {
@@ -220,7 +220,7 @@
}
void GrMockGpu::deleteTestingOnlyBackendTexture(const GrBackendTexture& tex) {
- SkASSERT(kMock_GrBackend == tex.backend());
+ SkASSERT(GrBackendApi::kMock == tex.backend());
GrMockTextureInfo info;
if (tex.getMockTextureInfo(&info)) {
diff --git a/src/gpu/mtl/GrMtlGpu.mm b/src/gpu/mtl/GrMtlGpu.mm
index ee38c00..6624eef 100644
--- a/src/gpu/mtl/GrMtlGpu.mm
+++ b/src/gpu/mtl/GrMtlGpu.mm
@@ -518,7 +518,7 @@
}
bool GrMtlGpu::isTestingOnlyBackendTexture(const GrBackendTexture& tex) const {
- SkASSERT(kMetal_GrBackend == tex.backend());
+ SkASSERT(GrBackendApi::kMetal == tex.backend());
GrMtlTextureInfo info;
if (!tex.getMtlTextureInfo(&info)) {
@@ -533,7 +533,7 @@
}
void GrMtlGpu::deleteTestingOnlyBackendTexture(const GrBackendTexture& tex) {
- SkASSERT(kMetal_GrBackend == tex.fBackend);
+ SkASSERT(GrBackendApi::kMetal == tex.fBackend);
GrMtlTextureInfo info;
if (tex.getMtlTextureInfo(&info)) {
@@ -561,7 +561,7 @@
}
void GrMtlGpu::deleteTestingOnlyBackendRenderTarget(const GrBackendRenderTarget& rt) {
- SkASSERT(kMetal_GrBackend == rt.fBackend);
+ SkASSERT(GrBackendApi::kMetal == rt.fBackend);
GrMtlTextureInfo info;
if (rt.getMtlTextureInfo(&info)) {
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 371fd31..d002955 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -1473,7 +1473,7 @@
}
bool GrVkGpu::isTestingOnlyBackendTexture(const GrBackendTexture& tex) const {
- SkASSERT(kVulkan_GrBackend == tex.fBackend);
+ SkASSERT(GrBackendApi::kVulkan == tex.fBackend);
GrVkImageInfo backend;
if (!tex.getVkImageInfo(&backend)) {
@@ -1495,7 +1495,7 @@
}
void GrVkGpu::deleteTestingOnlyBackendTexture(const GrBackendTexture& tex) {
- SkASSERT(kVulkan_GrBackend == tex.fBackend);
+ SkASSERT(GrBackendApi::kVulkan == tex.fBackend);
GrVkImageInfo info;
if (tex.getVkImageInfo(&info)) {
@@ -1526,7 +1526,7 @@
}
void GrVkGpu::deleteTestingOnlyBackendRenderTarget(const GrBackendRenderTarget& rt) {
- SkASSERT(kVulkan_GrBackend == rt.fBackend);
+ SkASSERT(GrBackendApi::kVulkan == rt.fBackend);
GrVkImageInfo info;
if (rt.getVkImageInfo(&info)) {