Add offscreen context creation attributes to GGL.

View contexts and more extensive color format picking not handled yet.

BUG=39849
TEST=WebGL conformance tests (context*.html)

Review URL: http://codereview.chromium.org/3302019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61220 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 26 insertions, 6 deletions

diff --git a/app/gfx/gl/generate_bindings.py b/app/gfx/gl/generate_bindings.py
index b3449b7..21a8137 100644
--- a/app/gfx/gl/generate_bindings.py
+++ b/app/gfx/gl/generate_bindings.py
@@ -32,6 +32,10 @@ GL_FUNCTIONS = [
     'GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, '
     'GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, '
     'GLbitfield mask, GLenum filter'],
+['void', ['glBlitFramebufferANGLE', 'BlitFramebuffer'],
+    'GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, '
+    'GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, '
+    'GLbitfield mask, GLenum filter'],
 ['void', ['glBufferData'],
     'GLenum target, GLsizei size, const void* data, GLenum usage'],
 ['void', ['glBufferSubData'],
@@ -162,6 +166,10 @@ GL_FUNCTIONS = [
     'glRenderbufferStorageMultisample'],
     'GLenum target, GLsizei samples, GLenum internalformat, '
     'GLsizei width, GLsizei height'],
+['void', ['glRenderbufferStorageMultisampleANGLE',
+    'glRenderbufferStorageMultisample'],
+    'GLenum target, GLsizei samples, GLenum internalformat, '
+    'GLsizei width, GLsizei height'],
 ['void', ['glRenderbufferStorageEXT', 'glRenderbufferStorage'],
     'GLenum target, GLenum internalformat, GLsizei width, GLsizei height'],
 ['void', ['glSampleCoverage'], 'GLclampf value, GLboolean invert'],
diff --git a/app/gfx/gl/gl_interface.h b/app/gfx/gl/gl_interface.h
index 0d52793..40c83c0 100644
--- a/app/gfx/gl/gl_interface.h
+++ b/app/gfx/gl/gl_interface.h
@@ -50,6 +50,11 @@ class GLInterface {
   virtual void BlendFuncSeparate(
       GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) = 0;
 
+  virtual void BlitFramebufferANGLE(
+      GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+      GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+      GLbitfield mask, GLenum filter) = 0;
+
   virtual void BlitFramebufferEXT(
       GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
       GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
@@ -267,6 +272,10 @@ class GLInterface {
   virtual void RenderbufferStorageEXT(
       GLenum target, GLenum internalformat, GLsizei width, GLsizei height) = 0;
 
+  virtual void RenderbufferStorageMultisampleANGLE(
+      GLenum target, GLsizei samples, GLenum internalformat,
+      GLsizei width, GLsizei height) = 0;
+
   virtual void RenderbufferStorageMultisampleEXT(
       GLenum target, GLsizei samples, GLenum internalformat,
       GLsizei width, GLsizei height) = 0;
@@ -401,6 +410,3 @@ class GLInterface {
 }  // namespace gfx
 
 #endif  // APP_GFX_GL_GL_INTERFACE_H_
-
-
-
diff --git a/app/gfx/gl/gl_mock.h b/app/gfx/gl/gl_mock.h
index 4564fee..235b9af 100644
--- a/app/gfx/gl/gl_mock.h
+++ b/app/gfx/gl/gl_mock.h
@@ -46,6 +46,11 @@ class MockGLInterface : public GLInterface {
   MOCK_METHOD4(BlendFuncSeparate, void(
       GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha));
 
+  MOCK_METHOD10(BlitFramebufferANGLE, void(
+      GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+      GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+      GLbitfield mask, GLenum filter));
+
   MOCK_METHOD10(BlitFramebufferEXT, void(
       GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
       GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
@@ -262,6 +267,10 @@ class MockGLInterface : public GLInterface {
   MOCK_METHOD4(RenderbufferStorageEXT, void(
       GLenum target, GLenum internalformat, GLsizei width, GLsizei height));
 
+  MOCK_METHOD5(RenderbufferStorageMultisampleANGLE, void(
+      GLenum target, GLsizei samples, GLenum internalformat,
+      GLsizei width, GLsizei height));
+
   MOCK_METHOD5(RenderbufferStorageMultisampleEXT, void(
       GLenum target, GLsizei samples, GLenum internalformat,
       GLsizei width, GLsizei height));
@@ -398,6 +407,3 @@ class MockGLInterface : public GLInterface {
 }  // namespace gfx
 
 #endif  // APP_GFX_GL_GL_MOCK_H_
-
-
-