diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 18:15:18 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 18:15:18 +0000 |
| commit | 49cabed26b9fdcb286c5019352b458118a9b008a (patch) | |
| tree | 54512a9fbfe6d529c31213e1fc8a9a1da0290ff1 /gpu/GLES2 | |
| parent | 001b5ce4ba97e14d6c61d5470166253ece430477 (diff) | |
| download | chromium_src-49cabed26b9fdcb286c5019352b458118a9b008a.zip chromium_src-49cabed26b9fdcb286c5019352b458118a9b008a.tar.gz chromium_src-49cabed26b9fdcb286c5019352b458118a9b008a.tar.bz2 | |
Split incompatible MSAA extensions.
This splits the commandbuffer client interfaces for extensions in the style of
GL_EXT_framebuffer_multisample (explicit resolve with glBlitFramebuffer)
vs. multisampled_render_to_texture.
glBlitFramebufferEXT() is also renamed to glBlitFrambufferCHROMIUM simply
to make it obvious that it is to be used with
glRenderbufferStorageMultisampleCHROMIUM rather than glRenderbufferStorageMultisampleEXT.
BUG=314214
R=brettw@chromium.org, kbr@chromium.org, piman@chromium.org
TBR=bsalomon@google.com
Review URL: https://codereview.chromium.org/63583002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/gl2chromium_autogen.h | 4 | ||||
| -rw-r--r-- | gpu/GLES2/gl2extchromium.h | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/gpu/GLES2/gl2chromium_autogen.h b/gpu/GLES2/gl2chromium_autogen.h index e2e1c1f..c18386b 100644 --- a/gpu/GLES2/gl2chromium_autogen.h +++ b/gpu/GLES2/gl2chromium_autogen.h @@ -156,7 +156,9 @@ #define glVertexAttrib4fv GLES2_GET_FUN(VertexAttrib4fv) #define glVertexAttribPointer GLES2_GET_FUN(VertexAttribPointer) #define glViewport GLES2_GET_FUN(Viewport) -#define glBlitFramebufferEXT GLES2_GET_FUN(BlitFramebufferEXT) +#define glBlitFramebufferCHROMIUM GLES2_GET_FUN(BlitFramebufferCHROMIUM) +#define glRenderbufferStorageMultisampleCHROMIUM GLES2_GET_FUN( \ + RenderbufferStorageMultisampleCHROMIUM) #define glRenderbufferStorageMultisampleEXT GLES2_GET_FUN( \ RenderbufferStorageMultisampleEXT) #define glFramebufferTexture2DMultisampleEXT GLES2_GET_FUN( \ diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h index bd4d432..1b266e5 100644 --- a/gpu/GLES2/gl2extchromium.h +++ b/gpu/GLES2/gl2extchromium.h @@ -237,9 +237,16 @@ typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC) ( #endif #endif /* GL_CHROMIUM_command_buffer_query */ -/* GL_EXT_framebuffer_multisample */ -#ifndef GL_EXT_framebuffer_multisample -#define GL_EXT_framebuffer_multisample 1 +/* GL_CHROMIUM_framebuffer_multisample */ +#ifndef GL_CHROMIUM_framebuffer_multisample +#define GL_CHROMIUM_framebuffer_multisample 1 + +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleCHROMIUM (GLenum, GLsizei, GLenum, GLsizei, GLsizei); +GL_APICALL void GL_APIENTRY glBlitFramebufferCHROMIUM (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +#endif +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECHROMIUMPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERCHROMIUMPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); #ifndef GL_FRAMEBUFFER_BINDING_EXT #define GL_FRAMEBUFFER_BINDING_EXT GL_FRAMEBUFFER_BINDING @@ -312,7 +319,7 @@ typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC) ( #ifndef GL_FRAMEBUFFER_BINDING #define GL_FRAMEBUFFER_BINDING 0x8CA6 #endif -#endif /* GL_EXT_framebuffer_multisample */ +#endif /* GL_CHROMIUM_framebuffer_multisample */ /* GL_CHROMIUM_texture_compression_dxt3 */ #ifndef GL_CHROMIUM_texture_compression_dxt3 |