Disable MSAA in SkOsWindow on mac and windows
git-svn-id: http://skia.googlecode.com/svn/trunk@1258 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/utils/mac/SkOSWindow_Mac.cpp b/src/utils/mac/SkOSWindow_Mac.cpp
index ac0f203..f1a2926 100644
--- a/src/utils/mac/SkOSWindow_Mac.cpp
+++ b/src/utils/mac/SkOSWindow_Mac.cpp
@@ -455,6 +455,8 @@
}
}
+#define USE_MSAA 0
+
AGLContext create_gl(WindowRef wref)
{
GLint major, minor;
@@ -466,10 +468,12 @@
const GLint pixelAttrs[] = {
AGL_RGBA,
AGL_STENCIL_SIZE, 8,
+#if USE_MSAA
AGL_SAMPLE_BUFFERS_ARB, 1,
- AGL_MULTISAMPLE,
- AGL_SAMPLES_ARB, 8,
- AGL_ACCELERATED,
+ AGL_MULTISAMPLE,
+ AGL_SAMPLES_ARB, 8,
+#endif
+ AGL_ACCELERATED,
AGL_DOUBLEBUFFER,
AGL_NONE
};
diff --git a/src/utils/win/SkOSWindow_Win.cpp b/src/utils/win/SkOSWindow_Win.cpp
index 5ccb9e8..48a6183 100644
--- a/src/utils/win/SkOSWindow_Win.cpp
+++ b/src/utils/win/SkOSWindow_Win.cpp
@@ -352,6 +352,8 @@
#define WGL_SAMPLE_BUFFERS_ARB 0x2041
#define WGL_SAMPLES_ARB 0x2042
+#define USE_MSAA 0
+
HGLRC create_gl(HWND hwnd) {
HDC hdc;
HDC prevHDC;
@@ -418,8 +420,12 @@
WGL_SUPPORT_OPENGL_ARB, TRUE,
WGL_COLOR_BITS_ARB, 24,
WGL_STENCIL_BITS_ARB, 8,
+#if USE_MSAA
WGL_SAMPLE_BUFFERS_ARB, TRUE,
WGL_SAMPLES_ARB, 0,
+#else
+ 0, 0, 0, 0,
+#endif
0,0
};
for (int samples = 16; samples > 1; --samples) {