Assert when running SampleApp with msaa 16 on Windows 10

src/utils/win/SkWGL_win.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkWGL.h"
 
@@ skipping 105 matching lines @@
         return true;
     }
     return false;
 }
 }
 
 int SkWGLExtensions::selectFormat(const int formats[],
                                   int formatCount,
                                   HDC dc,
                                   int desiredSampleCount) const {
+    if (formatCount <= 0)

[bsalomon, 2015/11/03 18:28:14]

We always use braces

+        return -1;
     PixelFormat desiredFormat = {
         0,
         desiredSampleCount,
         0,
     };
     SkTDArray<PixelFormat> rankedFormats;
     rankedFormats.setCount(formatCount);
     for (int i = 0; i < formatCount; ++i) {
         static const int kQueryAttr = SK_WGL_SAMPLES;
         int numSamples;
@@ skipping 173 matching lines @@
         msaaIAttrs[kIAttrsCount - 2] = SK_WGL_SAMPLE_BUFFERS;
         msaaIAttrs[kIAttrsCount - 1] = TRUE;
         msaaIAttrs[kIAttrsCount + 0] = SK_WGL_SAMPLES;
         msaaIAttrs[kIAttrsCount + 1] = msaaSampleCount;
         msaaIAttrs[kIAttrsCount + 2] = 0;
         msaaIAttrs[kIAttrsCount + 3] = 0;
         unsigned int num;
         int formats[64];
         extensions.choosePixelFormat(dc, msaaIAttrs, fAttrs, 64, formats, &num);
         num = SkTMin(num, 64U);
-        formatsToTry[0] = extensions.selectFormat(formats, num, dc, msaaSampleCount);
+        formatsToTry[0] = num == 0 ? -1 : extensions.selectFormat(formats, num, dc, msaaSampleCount);

[bsalomon, 2015/11/03 18:28:14]

We wrap lines at 100 (usually). Maybe rewrite with an if. Do we really need this
change with the above one?

     }
 
     // Get a non-MSAA format
     int* format = -1 == formatsToTry[0] ? &formatsToTry[0] : &formatsToTry[1];
     unsigned int num;
     extensions.choosePixelFormat(dc, iAttrs, fAttrs, 1, format, &num);
 }
 
 static HGLRC create_gl_context(HDC dc, SkWGLExtensions extensions, SkWGLContextRequest contextType) {
     HDC prevDC = wglGetCurrentDC();
@@ skipping 118 matching lines @@
     wglDeleteContext(fGLRC);
     fExtensions.releasePbufferDC(fPbuffer, fDC);
     fExtensions.destroyPbuffer(fPbuffer);
 }
 
 SkWGLPbufferContext::SkWGLPbufferContext(HPBUFFER pbuffer, HDC dc, HGLRC glrc)
     : fPbuffer(pbuffer)
     , fDC(dc)
     , fGLRC(glrc) {
 }