Improve handling of GrPixelConfig in GrBackendTex/RT ctors

Make sure that no client facing code was relying on what we set as the
default value for fConfig by making in kUnkown.

Bug: skia:
Change-Id: Ie52ff08ba8deeacc16fe06eb0dd0c7292b2edf91
Reviewed-on: https://skia-review.googlesource.com/114261
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index de7399bd92..73c5fdf4b3 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -91,8 +91,16 @@ GrBackendRenderTarget GrGLRenderTarget::getBackendRenderTarget() const {
         numStencilBits = stencil->bits();
     }
 
-    return GrBackendRenderTarget(this->width(), this->height(), this->numColorSamples(),
-                                 numStencilBits, fbi);
+    GrBackendRenderTarget beRT = GrBackendRenderTarget(this->width(), this->height(),
+                                                       this->numColorSamples(), numStencilBits,
+                                                       fbi);
+#if GR_TEST_UTILS
+    // We shouldn't have to set this since the client can't access it and we will handle the config
+    // correctly if we go through our public SkSurface APIs. However, some of our tests bypass the
+    // public APIs so we need to set this manually here.
+    beRT.setPixelConfig(this->config());
+#endif
+    return beRT;
 }
 
 size_t GrGLRenderTarget::onGpuMemorySize() const {