Remove GrTexturePriv

This existed because GrTexture used to be public.

Change-Id: I5e507084ae12058a20481b517b9130b41c793d29
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305521
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

Author: bsalomon

gn/gpu.gni

@@ -238,7 +238,6 @@ skia_gpu_sources = [
   "$_src/gpu/GrTextureAdjuster.h",
   "$_src/gpu/GrTextureMaker.cpp",
   "$_src/gpu/GrTextureMaker.h",
-  "$_src/gpu/GrTexturePriv.h",
   "$_src/gpu/GrTextureProducer.cpp",
   "$_src/gpu/GrTextureProducer.h",
   "$_src/gpu/GrTextureProxy.cpp",

src/gpu/GrBackendTextureImageGenerator.cpp

@@ -19,7 +19,6 @@
 #include "src/gpu/GrResourceProviderPriv.h"
 #include "src/gpu/GrSemaphore.h"
 #include "src/gpu/GrTexture.h"
-#include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxyPriv.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/gl/GrGLTexture.h"

src/gpu/GrDrawingManager.cpp

@@ -30,7 +30,6 @@
 #include "src/gpu/GrSurfaceContext.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
 #include "src/gpu/GrTexture.h"
-#include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/GrTextureProxyPriv.h"
 #include "src/gpu/GrTextureResolveRenderTask.h"

src/gpu/GrGpu.cpp

@@ -31,7 +31,6 @@
 #include "src/gpu/GrStencilAttachment.h"
 #include "src/gpu/GrStencilSettings.h"
 #include "src/gpu/GrSurfacePriv.h"
-#include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxyPriv.h"
 #include "src/gpu/GrTracing.h"
 #include "src/utils/SkJSONWriter.h"
@@ -159,7 +158,7 @@ sk_sp<GrTexture> GrGpu::createTexture(SkISize dimensions,
     auto tex = this->createTextureCommon(dimensions, format, renderable, renderTargetSampleCnt,
                                          budgeted, isProtected, mipLevelCount, levelClearMask);
     if (tex && mipMapped == GrMipmapped::kYes && levelClearMask) {
-        tex->texturePriv().markMipmapsClean();
+        tex->markMipmapsClean();
     }
     return tex;
 }
@@ -215,7 +214,7 @@ sk_sp<GrTexture> GrGpu::createTexture(SkISize dimensions,
             markMipLevelsClean = true;
         }
         if (markMipLevelsClean) {
-            tex->texturePriv().markMipmapsClean();
+            tex->markMipmapsClean();
         }
     }
     return tex;
@@ -552,8 +551,8 @@ bool GrGpu::regenerateMipMapLevels(GrTexture* texture) {
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     SkASSERT(texture);
     SkASSERT(this->caps()->mipmapSupport());
-    SkASSERT(texture->texturePriv().mipmapped() == GrMipmapped::kYes);
-    if (!texture->texturePriv().mipmapsAreDirty()) {
+    SkASSERT(texture->mipmapped() == GrMipmapped::kYes);
+    if (!texture->mipmapsAreDirty()) {
         // This can happen when the proxy expects mipmaps to be dirty, but they are not dirty on the
         // actual target. This may be caused by things that the drawingManager could not predict,
         // i.e., ops that don't draw anything, aborting a draw for exceptional circumstances, etc.
@@ -564,7 +563,7 @@ bool GrGpu::regenerateMipMapLevels(GrTexture* texture) {
         return false;
     }
     if (this->onRegenerateMipMapLevels(texture)) {
-        texture->texturePriv().markMipmapsClean();
+        texture->markMipmapsClean();
         return true;
     }
     return false;
@@ -589,7 +588,7 @@ void GrGpu::didWriteToSurface(GrSurface* surface, GrSurfaceOrigin origin, const
     if (nullptr == bounds || !bounds->isEmpty()) {
         GrTexture* texture = surface->asTexture();
         if (texture && 1 == mipLevels) {
-            texture->texturePriv().markMipmapsDirty();
+            texture->markMipmapsDirty();
         }
     }
 }

src/gpu/GrOpsRenderPass.cpp

@@ -17,7 +17,7 @@
 #include "src/gpu/GrRenderTargetPriv.h"
 #include "src/gpu/GrScissorState.h"
 #include "src/gpu/GrSimpleMesh.h"
-#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTexture.h"
 
 void GrOpsRenderPass::begin() {
     fDrawPipelineStatus = DrawPipelineStatus::kNotConfigured;
@@ -162,8 +162,7 @@ void GrOpsRenderPass::bindTextures(const GrPrimitiveProcessor& primProc,
             (tex->width() != 1 || tex->height() != 1)) {
             // There are some cases where we might be given a non-mipmapped texture with a mipmap
             // filter. See skbug.com/7094.
-            SkASSERT(tex->texturePriv().mipmapped() != GrMipmapped::kYes ||
-                     !tex->texturePriv().mipmapsAreDirty());
+            SkASSERT(tex->mipmapped() != GrMipmapped::kYes || !tex->mipmapsAreDirty());
         }
     }
 #endif

src/gpu/GrOpsTask.cpp

@@ -23,7 +23,7 @@
 #include "src/gpu/GrRenderTargetPriv.h"
 #include "src/gpu/GrResourceAllocator.h"
 #include "src/gpu/GrStencilAttachment.h"
-#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/geometry/GrRect.h"
 #include "src/gpu/ops/GrClearOp.h"
 

src/gpu/GrProgramDesc.cpp

@@ -15,7 +15,7 @@
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrRenderTargetPriv.h"
 #include "src/gpu/GrShaderCaps.h"
-#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 

src/gpu/GrProgramInfo.cpp

@@ -22,7 +22,7 @@ GrStencilSettings GrProgramInfo::nonGLStencilSettings() const {
 }
 
 #ifdef SK_DEBUG
-#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTexture.h"
 
 void GrProgramInfo::validate(bool flushTime) const {
     if (flushTime) {
@@ -47,8 +47,7 @@ void GrProgramInfo::checkMSAAAndMIPSAreResolved() const {
             (tex->width() != 1 || tex->height() != 1)) {
             // There are some cases where we might be given a non-mipmapped texture with a
             // mipmap filter. See skbug.com/7094.
-            SkASSERT(tex->texturePriv().mipmapped() != GrMipmapped::kYes ||
-                     !tex->texturePriv().mipmapsAreDirty());
+            SkASSERT(tex->mipmapped() != GrMipmapped::kYes || !tex->mipmapsAreDirty());
         }
     });
 }

src/gpu/GrResourceProvider.cpp

@@ -24,7 +24,7 @@
 #include "src/gpu/GrResourceCache.h"
 #include "src/gpu/GrSemaphore.h"
 #include "src/gpu/GrStencilAttachment.h"
-#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/SkGr.h"
 
 const int GrResourceProvider::kMinScratchTextureSize = 16;
@@ -263,8 +263,8 @@ sk_sp<GrTexture> GrResourceProvider::refScratchTexture(SkISize dimensions,
     // to fall back to making a new texture.
     if (fGpu->caps()->reuseScratchTextures() || renderable == GrRenderable::kYes) {
         GrScratchKey key;
-        GrTexturePriv::ComputeScratchKey(*this->caps(), format, dimensions, renderable,
-                                         renderTargetSampleCnt, mipMapped, isProtected, &key);
+        GrTexture::ComputeScratchKey(*this->caps(), format, dimensions, renderable,
+                                     renderTargetSampleCnt, mipMapped, isProtected, &key);
         GrGpuResource* resource = fCache->findAndRefScratchResource(key);
         if (resource) {
             fGpu->stats()->incNumScratchTexturesReused();

src/gpu/GrSurfaceProxy.cpp

@@ -20,7 +20,7 @@
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/GrStencilAttachment.h"
 #include "src/gpu/GrSurfacePriv.h"
-#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureRenderTargetProxy.h"
 
 #ifdef SK_DEBUG
@@ -212,8 +212,8 @@ void GrSurfaceProxy::computeScratchKey(const GrCaps& caps, GrScratchKey* key) co
         mipMapped = tp->mipmapped();
     }
 
-    GrTexturePriv::ComputeScratchKey(caps, this->backendFormat(), this->backingStoreDimensions(),
-                                     renderable, sampleCount, mipMapped, fIsProtected, key);
+    GrTexture::ComputeScratchKey(caps, this->backendFormat(), this->backingStoreDimensions(),
+                                 renderable, sampleCount, mipMapped, fIsProtected, key);
 }
 
 SkISize GrSurfaceProxy::backingStoreDimensions() const {