Implement support for mixed sampled render targets

include/gpu/GrTypes.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTypes_DEFINED
 #define GrTypes_DEFINED
@@ skipping 405 matching lines @@
  * to BottomLeft.
  */
 
 enum GrSurfaceOrigin {
     kDefault_GrSurfaceOrigin,         // DEPRECATED; to be removed
     kTopLeft_GrSurfaceOrigin,
     kBottomLeft_GrSurfaceOrigin,
 };
 
 /**
+ * Sample config clarifies the meaning of samples count.
+ * In default kUnified_GrSampleConfig sample count refers to MSAA sample count.
+ * If NV_framebuffer_mixed_samples is available and sample config is chosen to be
+ * kStencil_GrSampleConfig, sample count refers to the stencil sample count only,
+ * and the color sample count is assumed to be zero.
+ */
+enum GrSampleConfig {
+    kUnified_GrSampleConfig,
+    kStencil_GrSampleConfig,
+};

[Chris Dalton, 2015/03/12 07:43:35]

So I've been thinking:

rt.numSamples(kUnified_GrSampleConfig)  isn't clear
rt.isMultisampled(kStencil_GrSampleConfig)  is a confusing way to ask if it's
multisampled anywhere

What if we take this enum out of GrTypes.h, and just put it inside of
GrRenderTarget? Maybe make two enums, one for numSamples and one for
isMultisampled. Something where you can ask about whether different stages of
the pipeline have multisample. e.g:

numSamples(StencilAndColor)
numSamples(Stencil)

isMultisampled(Anythere)
isMultisampled(Everywhere)
isMultisampled(Color)
isMultisampled(Stencil)
isMultisampled(Raster)

Also, we would have to replace 'GrSampleConfig fSampleConfig' from
GrBackendRenderTargetDesc with a bool.

This is mostly just a brain dump so I'm curious to hear what you think.

+
+/**
  * Describes a surface to be created.
  */
 struct GrSurfaceDesc {
     GrSurfaceDesc()
     : fFlags(kNone_GrSurfaceFlags)
     , fOrigin(kDefault_GrSurfaceOrigin)
     , fWidth(0)
     , fHeight(0)
     , fConfig(kUnknown_GrPixelConfig)
     , fSampleCnt(0) {
@@ skipping 114 matching lines @@
     int                             fSampleCnt;
     /**
      * Number of bits of stencil per-pixel.
      */
     int                             fStencilBits;
     /**
      * Handle to the 3D API object.
      * OpenGL: FBO ID
      */
     GrBackendObject                 fRenderTargetHandle;
+    /**
+     * Clarifies the meaning of fSampleCnt.  By default the value refers to
+     * MSAA sample count.  If sample config is kStencil_GrSampleConfig, then
+     * fSampleCnt refers to stencil samples only, and color sample count is
+     * assumed to be zero.  kStencil_GrSampleConfig can be chosen only if
+     * NV_framebuffer_mixed_samples is available.
+     */

[Chris Dalton, 2015/03/12 07:43:35]

Any reason why this is at the end rather than right after fSampleCnt?

Also, I may reword the comment a bit. Maybe something more along these lines:

If fSampleCnt is > 1, which buffers are multisampled (color and stencil, or just
stencil?). The default is both. Note that mixing multisampled and aliased
buffers is only possible if NV_framebuffer_mixed_samples is available.

[vbuzinov, 2015/03/13 13:37:22]

Done.

+    GrSampleConfig                  fSampleConfig;
 };
 
 /**
  * The GrContext's cache of backend context state can be partially invalidated.
  * These enums are specific to the GL backend and we'd add a new set for an alternative backend.
  */
 enum GrGLBackendState {
     kRenderTarget_GrGLBackendState     = 1 << 0,
     kTextureBinding_GrGLBackendState   = 1 << 1,
     // View state stands for scissor and viewport
@@ skipping 56 matching lines @@
 public:
     GrAutoMalloc() : INHERITED() {}
     explicit GrAutoMalloc(size_t size) : INHERITED(size) {}
     virtual ~GrAutoMalloc() {}
 private:
     typedef GrAutoMallocBaseType INHERITED;
 };
 
 #undef GrAutoMallocBaseType
 #endif