aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-10 20:37:41 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-10 20:37:41 +0000
commita3b84d41efbbc5ab1e050a33d66dca4d1c44c9e3 (patch)
tree5dfdcb17f8335f373d0071c201c511bb649ae37b /include/views
parentbc55eec80ef376208b3c1bfc65d8dc8b672d59f0 (diff)
Support MSAA4 and (non-ES) OpenGL in Android SampleApp
Add a menu item to set the OpenGL context type that SampleApp uses on Android. The submenu of the new item will present options to create OpenGL ES or OpenGL, aliased or multisampled. R=djsollen@google.com, bsalomon@google.com Author: kkinnunen@nvidia.com Review URL: https://codereview.chromium.org/60273006 git-svn-id: http://skia.googlecode.com/svn/trunk@12610 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/views')
-rw-r--r--include/views/SkOSWindow_Android.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/views/SkOSWindow_Android.h b/include/views/SkOSWindow_Android.h
index 77c156cd23..ae4e880039 100644
--- a/include/views/SkOSWindow_Android.h
+++ b/include/views/SkOSWindow_Android.h
@@ -29,12 +29,7 @@ public:
int fStencilBits;
};
- bool attach(SkBackEndTypes /* attachType */, int /* msaaSampleCount */, AttachmentInfo* info) {
- // These are the values requested in SkiaSampleView.java
- info->fSampleCount = 0;
- info->fStencilBits = 8;
- return true;
- }
+ bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo* info);
void detach() {}
void present() {}