Move the GrGLGpu config stencil format index into ConfigTable

src/gpu/gl/GrGLGpu.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLGpu_DEFINED
 #define GrGLGpu_DEFINED
 
@@ skipping 135 matching lines @@
     GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc,
                                          GrGpuResource::LifeCycle lifeCycle,
                                          const void* srcData) override;
     GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override;
     GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override;
     GrTransferBuffer* onCreateTransferBuffer(size_t size, TransferType type) override;
     GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&, GrWrapOwnership) override;
     GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&,
                                               GrWrapOwnership) override;
     // Given a GrPixelConfig return the index into the stencil format array on GrGLCaps to a
-    // compatible stencil format.
+    // compatible stencil format, or negative if there is no compatible stencil format.

[egdaniel, 2015/12/16 21:52:11]

Not a big issue, I can go either way, but would it make more sense to say:

"Given a GrPixelConfig return the index into the stencil format array on
GrGLCaps to a compatible stencil format, or
ConfigEntry::kUnsupported_StencilFormatIndex if there is no compatible stencil
format." We should never return kUnknown and this makes it very clear what
values can be returned from this function. If we go this route I would change
the if statement in createStencil back to what it was before.

[bsalomon, 2015/12/17 16:56:45]

My feeling is that kUnsupported and kUnimplemented are implementation details
and that if this code was in another class we might not expose kUnsupported or
kUnimplemented to the caller. I suppose we could expose kUnsupported only but
since the return value is an index it seems straightforward to me to say
anything negative means we failed to find a compatible format.

     int getCompatibleStencilIndex(GrPixelConfig config);
 
     void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override;
 
     void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) override;
 
     bool onReadPixels(GrSurface*,
                       int left, int top,
                       int width, int height,
                       GrPixelConfig,
@@ skipping 367 matching lines @@
         if (target == GR_GL_TEXTURE_2D) {
             return 0;
         } else {
             SkASSERT(target == GR_GL_TEXTURE_EXTERNAL);
             return 1;
         }
     }
 
     struct ConfigEntry {
         // Default constructor inits to known bad GL enum values.
-        ConfigEntry() { memset(this, 0xAB, sizeof(ConfigEntry)); }
+        ConfigEntry() {
+            memset(this, 0xAB, sizeof(ConfigEntry));
+            fStencilFormatIndex = kUnknown_StencilIndex;
+        }
         GrGLenum fBaseInternalFormat;
         GrGLenum fSizedInternalFormat;
         GrGLenum fExternalFormat;
         GrGLenum fExternalType;
+
+        // Index into GrGLCaps's list of stencil formats. Support is determined experimentally and
+        // lazily.
+        int      fStencilFormatIndex;
+        enum {
+            // This indicates that a stencil format has not yet been determined for the config.
+            kUnknown_StencilIndex = -1,
+            // This indicates that there is no supported stencil format for the config.
+            kUnsupported_StencilFormatIndex = -2
+        };
     };
 
-    ConfigEntry fConfigTable[kLast_GrPixelConfig + 1];
-
-    // Mapping of pixel configs to known supported stencil formats to be used
-    // when adding a stencil buffer to a framebuffer.
-    int fPixelConfigToStencilIndex[kGrPixelConfigCnt];
+    ConfigEntry fConfigTable[kGrPixelConfigCnt];
 
     typedef GrGpu INHERITED;
     friend class GrGLPathRendering; // For accessing setTextureUnit.
 };
 
 #endif