Add support for ES3 MSAA.

Add support for ES3 MSAA.

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

[bsalomon, 2013-08-23 17:11:48]

I added an ugly macro to stage this WRT rolling Chrome. Chrome creates their own
GrGLInterface and sets the fRenderbufferStorageMultisample pointer to
glRenderBufferStorageMultisampleIMG/EXT. After this change we want both that
pointer and the ES3 glRenderBufferStorageMultisample when both are available
since we may actually use the extension rather than ES3 MSAA.

[robertphillips, 2013-08-23 17:25:34]

lgtm + questions

https://codereview.chromium.org/23404002/diff/9001/include/gpu/gl/GrGLConfig.h
File include/gpu/gl/GrGLConfig.h (right):

https://codereview.chromium.org/23404002/diff/9001/include/gpu/gl/GrGLConfig....
include/gpu/gl/GrGLConfig.h:165: // We now have a separate GrGLInterface
function pointer entry for the IMG/EXT version of
setting setting -> setting

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/GrGLInterface.cpp
File src/gpu/gl/GrGLInterface.cpp (right):

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/GrGLInterface.c...
src/gpu/gl/GrGLInterface.cpp:327: #if GR_GL_IGNORE_ES3_MSAA
can we share the second two if blocks between the two cases?

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/GrGLInterface.c...
src/gpu/gl/GrGLInterface.cpp:333: } else if
(extensions.has("GL_APPLE_framebuffer_multisample")) {
why not fRenderbufferStorageMultisampleES2APPLE?

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/GrGLInterface.c...
src/gpu/gl/GrGLInterface.cpp:339:
extensions.has("GL_EXT_multisampled_render_to_texture")) {
why not fRenderbufferStorageMultisampleES2EXT?

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/android/GrGLCre...
File src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp (right):

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/android/GrGLCre...
src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp:153: #if
GR_GL_IGNORE_ES3_MSAA
could these two if blocks be shared with the !GR_GL_IGNORE_ES2_MSAA path?

[bsalomon, 2013-08-23 17:28:49]

https://codereview.chromium.org/23404002/diff/9001/include/gpu/gl/GrGLConfig.h
File include/gpu/gl/GrGLConfig.h (right):

https://codereview.chromium.org/23404002/diff/9001/include/gpu/gl/GrGLConfig....
include/gpu/gl/GrGLConfig.h:165: // We now have a separate GrGLInterface
function pointer entry for the IMG/EXT version of
On 2013/08/23 17:25:34, robertphillips wrote:
> setting setting -> setting

will do

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/GrGLInterface.cpp
File src/gpu/gl/GrGLInterface.cpp (right):

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/GrGLInterface.c...
src/gpu/gl/GrGLInterface.cpp:327: #if GR_GL_IGNORE_ES3_MSAA
On 2013/08/23 17:25:34, robertphillips wrote:
> can we share the second two if blocks between the two cases?

I think not, see responses below. The plan is to delete this whole #if block
once Chrome is updated.

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/GrGLInterface.c...
src/gpu/gl/GrGLInterface.cpp:333: } else if
(extensions.has("GL_APPLE_framebuffer_multisample")) {
On 2013/08/23 17:25:34, robertphillips wrote:
> why not fRenderbufferStorageMultisampleES2APPLE?

That doesn't exist when GR_GL_IGNORE_ES3_MSAA is true

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/GrGLInterface.c...
src/gpu/gl/GrGLInterface.cpp:339:
extensions.has("GL_EXT_multisampled_render_to_texture")) {
On 2013/08/23 17:25:34, robertphillips wrote:
> why not fRenderbufferStorageMultisampleES2EXT?

ditto

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/android/GrGLCre...
File src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp (right):

https://codereview.chromium.org/23404002/diff/9001/src/gpu/gl/android/GrGLCre...
src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp:153: #if
GR_GL_IGNORE_ES3_MSAA
On 2013/08/23 17:25:34, robertphillips wrote:
> could these two if blocks be shared with the !GR_GL_IGNORE_ES2_MSAA path?

They don't use ES2APPLE or ES2EXT. It'll also be a little easier to just blow
away this whole block after Chrome gets updated.

[jvanverth1, 2013-08-27 17:39:06]

Just one comment:

https://codereview.chromium.org/23404002/diff/9001/include/gpu/gl/GrGLInterfa...
File include/gpu/gl/GrGLInterface.h (right):

https://codereview.chromium.org/23404002/diff/9001/include/gpu/gl/GrGLInterfa...
include/gpu/gl/GrGLInterface.h:246: #endif
Maybe a comment here stating that this is where
GL_CHROMIUM/ANGLE_framebuffer_multisample/ES3 is stored? Just to be consistent
with the other two comments.

[bsalomon, 2013-09-05 22:00:15]

https://codereview.chromium.org/23404002/diff/9001/include/gpu/gl/GrGLInterfa...
File include/gpu/gl/GrGLInterface.h (right):

https://codereview.chromium.org/23404002/diff/9001/include/gpu/gl/GrGLInterfa...
include/gpu/gl/GrGLInterface.h:246: #endif
On 2013/08/27 17:39:06, JimVV wrote:
> Maybe a comment here stating that this is where
> GL_CHROMIUM/ANGLE_framebuffer_multisample/ES3 is stored? Just to be consistent
> with the other two comments.

Done.

[commit-bot: I haz the power, 2013-09-05 22:00:32]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/23404002/20001

[commit-bot: I haz the power, 2013-09-05 23:44:14]

Change committed as 11124