Revert of Store context options on caps.

include/gpu/GrCaps.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef GrCaps_DEFINED
 #define GrCaps_DEFINED
 
 #include "GrTypes.h"
 #include "GrTypesPriv.h"
 #include "GrShaderVar.h"
 #include "SkRefCnt.h"
 #include "SkString.h"
 
-struct GrContextOptions;
-
 class GrShaderCaps : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrShaderCaps)
 
     /** Info about shader variable precision within a given shader stage. That is, this info
         is relevant to a float (or vecNf) variable declared with a GrSLPrecision
         in a given GrShaderType. The info here is hoisted from the OpenGL spec. */
     struct PrecisionInfo {
         PrecisionInfo() {
             fLogRangeLow = 0;
@@ skipping 69 matching lines @@
     typedef SkRefCnt INHERITED;
 };
 
 /**
  * Represents the capabilities of a GrContext.
  */
 class GrCaps : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrCaps)
 
-    GrCaps(const GrContextOptions&);
+    GrCaps();
 
     virtual SkString dump() const;
 
     GrShaderCaps* shaderCaps() const { return fShaderCaps; }
 
     bool npotTextureTileSupport() const { return fNPOTTextureTileSupport; }
     /** To avoid as-yet-unnecessary complexity we don't allow any partial support of MIP Maps (e.g.
         only for POT textures) */
     bool mipMapSupport() const { return fMipMapSupport; }
     bool twoSidedStencilSupport() const { return fTwoSidedStencilSupport; }
@@ skipping 62 matching lines @@
     bool isConfigRenderable(GrPixelConfig config, bool withMSAA) const {
         SkASSERT(kGrPixelConfigCnt > config);
         return fConfigRenderSupport[config][withMSAA];
     }
 
     bool isConfigTexturable(GrPixelConfig config) const {
         SkASSERT(kGrPixelConfigCnt > config);
         return fConfigTextureSupport[config];
     }
 
-    bool suppressPrints() const { return fSupressPrints; }
-
-    bool drawPathMasksToCompressedTexturesSupport() const {
-        return fDrawPathMasksToCompressedTextureSupport; }
-
 protected:
     SkAutoTUnref<GrShaderCaps>    fShaderCaps;
 
     bool fNPOTTextureTileSupport        : 1;
     bool fMipMapSupport                 : 1;
     bool fTwoSidedStencilSupport        : 1;
     bool fStencilWrapOpsSupport         : 1;
     bool fDiscardRenderTargetSupport    : 1;
     bool fReuseScratchTextures          : 1;
     bool fGpuTracingSupport             : 1;
     bool fCompressedTexSubImageSupport  : 1;
     bool fOversizedStencilSupport       : 1;
     bool fTextureBarrierSupport         : 1;
     // Driver workaround
     bool fUseDrawInsteadOfClear         : 1;
 
     BlendEquationSupport fBlendEquationSupport;
     uint32_t fMapBufferFlags;
 
     int fMaxRenderTargetSize;
     int fMaxTextureSize;
     int fMaxSampleCount;
 
     // The first entry for each config is without msaa and the second is with.
     bool fConfigRenderSupport[kGrPixelConfigCnt][2];
     bool fConfigTextureSupport[kGrPixelConfigCnt];
 
 private:
-    bool fSupressPrints : 1;
-    bool fDrawPathMasksToCompressedTextureSupport : 1;
-
     typedef SkRefCnt INHERITED;
 };
 
 #endif