Implement support for mixed sampled render targets

src/gpu/gl/GrGLCaps.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLCaps_DEFINED
 #define GrGLCaps_DEFINED
@@ skipping 49 matching lines @@
          * Instead the texture is multisampled when bound to the FBO and then resolved automatically
          * when read. It also defines an alternate value for GL_MAX_SAMPLES (which we call
          * GR_GL_MAX_SAMPLES_IMG).
          */
         kES_IMG_MsToTexture_MSFBOType,
         /**
          * GL_EXT_multisampled_render_to_texture. Same as the IMG one above but uses the standard
          * GL_MAX_SAMPLES value.
          */
         kES_EXT_MsToTexture_MSFBOType,
+        /**
+         * GL_NV_framebuffer_mixed_samples.
+         */
+        kMixedSamples_MSFBOType,
 
-        kLast_MSFBOType = kES_EXT_MsToTexture_MSFBOType
+        kLast_MSFBOType = kMixedSamples_MSFBOType
     };
 
     enum InvalidateFBType {
         kNone_InvalidateFBType,
         kDiscard_InvalidateFBType,       //<! glDiscardFramebuffer()
         kInvalidate_InvalidateFBType,     //<! glInvalidateFramebuffer()
 
         kLast_InvalidateFBType = kInvalidate_InvalidateFBType
     };
 
@@ skipping 52 matching lines @@
      * Reports the type of MSAA FBO support.
      */
     MSFBOType msFBOType() const { return fMSFBOType; }
 
     /**
      * Does the supported MSAA FBO extension have MSAA renderbuffers?
      */
     bool usesMSAARenderBuffers() const {
         return kNone_MSFBOType != fMSFBOType &&
                kES_IMG_MsToTexture_MSFBOType != fMSFBOType &&
-               kES_EXT_MsToTexture_MSFBOType != fMSFBOType;
+               kES_EXT_MsToTexture_MSFBOType != fMSFBOType &&
+               kMixedSamples_MSFBOType != fMSFBOType;
     }
 
     /**
      * Is the MSAA FBO extension one where the texture is multisampled when bound to an FBO and
      * then implicitly resolved when read.
      */
     bool usesImplicitMSAAResolve() const {
         return kES_IMG_MsToTexture_MSFBOType == fMSFBOType ||
                kES_EXT_MsToTexture_MSFBOType == fMSFBOType;
     }
 
-    bool fbMixedSamplesSupport() const { return fFBMixedSamplesSupport; }
-
     InvalidateFBType invalidateFBType() const { return fInvalidateFBType; }
 
     /// What type of buffer mapping is supported?
     MapBufferType mapBufferType() const { return fMapBufferType; }
 
     /**
      * Gets an array of legal stencil formats. These formats are not guaranteed
      * to be supported by the driver but are legal GLenum names given the GL
      * version and extensions supported.
      */
@@ skipping 174 matching lines @@
     bool fTextureRedSupport : 1;
     bool fImagingSupport  : 1;
     bool fTwoFormatLimit : 1;
     bool fFragCoordsConventionSupport : 1;
     bool fVertexArrayObjectSupport : 1;
     bool fES2CompatibilitySupport : 1;
     bool fMultisampleDisableSupport : 1;
     bool fUseNonVBOVertexAndIndexDynamicData : 1;
     bool fIsCoreProfile : 1;
     bool fFullClearIsFree : 1;
-    bool fFBMixedSamplesSupport : 1;

[Chris Dalton, 2015/06/09 17:39:51]

Oops, thanks for catching that. I shouldn't have missed it in
https://codereview.chromium.org/1151793002

 
     struct ReadPixelsSupportedFormat {
         GrGLenum fFormat;
         GrGLenum fType;
         GrGLenum fFboFormat;
 
         bool operator==(const ReadPixelsSupportedFormat& rhs) const {
             return fFormat    == rhs.fFormat
                 && fType      == rhs.fType
                 && fFboFormat == rhs.fFboFormat;
@@ skipping 79 matching lines @@
     const char* fFBFetchColorName;
     const char* fFBFetchExtensionString;
 
     AdvBlendEqInteraction fAdvBlendEqInteraction;
 
     typedef GrShaderCaps INHERITED;
 };
 
 
 #endif