Support MSAA4 and (non-ES) OpenGL in Android SampleApp

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.

Committed: http://code.google.com/p/skia/source/detail?r=12610

[djsollen, 2013-11-07 16:57:43]

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/jn...
File platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp (right):

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/jn...
platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp:209:
msaaSampleCountString.printf("%d", msaaSampleCount);
printf in this case is a little more than you need you can just use
msaaSampleCountString.appendS32(msaaSampleCount)

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/pr...
File platform_tools/android/app/project.properties (right):

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/pr...
platform_tools/android/app/project.properties:14: target=android-17
I understand that we need to update this in order to support your feature, but
doing so isn't trivial as it requires our buildbots to have downloaded the
version 17 SDK. We are in progress to update to version 19 for other reasons so
I would prefer that we hold off submitting this CL until we do that.

https://code.google.com/p/skia/issues/detail?id=1817

That being said even though we are building against the v17 SDK the min SDK
version for the app is still v14 so if we are going to use a v17 API then we
need to guard its usage around some runtime API checks to ensure that we
preserve compatibility with older versions.

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
File platform_tools/android/app/src/com/skia/SkiaSampleActivity.java (right):

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
platform_tools/android/app/src/com/skia/SkiaSampleActivity.java:114: ((MenuItem)
menu.findItem(R.id.glcontext_opengles)).setChecked(!usesOpenGLAPI && !isMSAA4);
style nit, but a few of these lines exceed 100 characters.

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
File platform_tools/android/app/src/com/skia/SkiaSampleView.java (right):

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
platform_tools/android/app/src/com/skia/SkiaSampleView.java:34:
setEGLConfigChooser(new SampleViewEGLConfigChooser());
you may want do a runtime check of the android version here and always do the
old route if running on a device prior to v17.

http://developer.android.com/training/search/backward-compat.html

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
platform_tools/android/app/src/com/skia/SkiaSampleView.java:187: private class
SampleViewEGLConfigChooser implements GLSurfaceView.EGLConfigChooser {
this class should only be instantiated for devices running v17 and above.

[Kimmo Kinnunen, 2013-11-20 13:45:00]

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/jn...
File platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp (right):

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/jn...
platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp:209:
msaaSampleCountString.printf("%d", msaaSampleCount);
On 2013/11/07 16:57:43, djsollen wrote:
> printf in this case is a little more than you need you can just use
> msaaSampleCountString.appendS32(msaaSampleCount)

Done.

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
File platform_tools/android/app/src/com/skia/SkiaSampleActivity.java (right):

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
platform_tools/android/app/src/com/skia/SkiaSampleActivity.java:114: ((MenuItem)
menu.findItem(R.id.glcontext_opengles)).setChecked(!usesOpenGLAPI && !isMSAA4);
On 2013/11/07 16:57:43, djsollen wrote:
> style nit, but a few of these lines exceed 100 characters.

Done.

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
File platform_tools/android/app/src/com/skia/SkiaSampleView.java (right):

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
platform_tools/android/app/src/com/skia/SkiaSampleView.java:34:
setEGLConfigChooser(new SampleViewEGLConfigChooser());
On 2013/11/07 16:57:43, djsollen wrote:
> you may want do a runtime check of the android version here and always do the
> old route if running on a device prior to v17.
> 
> http://developer.android.com/training/search/backward-compat.html

Done.

https://codereview.chromium.org/60273006/diff/1/platform_tools/android/app/sr...
platform_tools/android/app/src/com/skia/SkiaSampleView.java:187: private class
SampleViewEGLConfigChooser implements GLSurfaceView.EGLConfigChooser {
On 2013/11/07 16:57:43, djsollen wrote:
> this class should only be instantiated for devices running v17 and above.

Done.

[djsollen, 2013-11-20 16:11:18]

looks good, but before we can submit we need to upgrade the SDK level on our
bots.

https://code.google.com/p/skia/issues/detail?id=1817

[Kimmo Kinnunen, 2013-12-09 07:25:17]

On 2013/11/20 16:11:18, djsollen wrote:
> looks good, but before we can submit we need to upgrade the SDK level on our
> bots.
> 
> https://code.google.com/p/skia/issues/detail?id=1817

The bug is not closed yet, but I believe the SDK level was increased both in
skia and in bot repo?

[djsollen, 2013-12-09 16:31:35]

lgtm

[commit-bot: I haz the power, 2013-12-10 12:54:55]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/kkinnunen@nvidia.com/60273006/210001

[commit-bot: I haz the power, 2013-12-10 12:54:59]

Presubmit check for 60273006-210001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Since the CL is editing public API, you must have an LGTM from one of:
('reed@chromium.org', 'reed@google.com', 'bsalomon@chromium.org',
'bsalomon@google.com')

[bsalomon, 2013-12-10 20:28:48]

On 2013/12/10 12:54:59, I haz the power (commit-bot) wrote:
> Presubmit check for 60273006-210001 failed and returned exit status 1.
> 
> Running presubmit commit checks ...
> 
> ** Presubmit ERRORS **
> Since the CL is editing public API, you must have an LGTM from one of:
> ('reed@chromium.org', 'reed@google.com', 'bsalomon@chromium.org',
> 'bsalomon@google.com')

lgtm

[commit-bot: I haz the power, 2013-12-10 20:29:08]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/kkinnunen@nvidia.com/60273006/210001

[commit-bot: I haz the power, 2013-12-10 20:38:13]

Change committed as 12610