aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar aleksandar.stojiljkovic <aleksandar.stojiljkovic@intel.com>2015-11-05 07:48:12 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-05 07:48:12 -0800
commit2944fbb5329fc3026c541fa818489954d910625d (patch)
treeddaaae82ad283bccb9aadfbf67ba0152161ccf57
parent8377e80951326f94714b31ede711cd0757d37fcd (diff)
Assert when running SampleApp with msaa 16 on Windows 10
Trivial: skip calling SkWGLExtensions::selectFormat with 0 elements, and handle if called. BUG=4529 Review URL: https://codereview.chromium.org/1427583007
-rw-r--r--src/utils/win/SkWGL_win.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp
index bc22795e2f..5afcae94ce 100644
--- a/src/utils/win/SkWGL_win.cpp
+++ b/src/utils/win/SkWGL_win.cpp
@@ -126,6 +126,9 @@ int SkWGLExtensions::selectFormat(const int formats[],
int formatCount,
HDC dc,
int desiredSampleCount) const {
+ if (formatCount <= 0) {
+ return -1;
+ }
PixelFormat desiredFormat = {
0,
desiredSampleCount,