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/command_buffer/tests | |
| 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/command_buffer/tests')
| -rw-r--r-- | gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc index 4ade1e4..fe61d51 100644 --- a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc +++ b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc @@ -82,7 +82,7 @@ TEST_F(GLChromiumFramebufferMultisampleTest, DrawAndResolve) { GLuint sample_fbo, sample_rb; glGenRenderbuffers(1, &sample_rb); glBindRenderbuffer(GL_RENDERBUFFER, sample_rb); - glRenderbufferStorageMultisampleEXT( + glRenderbufferStorageMultisampleCHROMIUM( GL_RENDERBUFFER, num_samples, GL_RGBA8_OES, width, height); GLint param = 0; glGetRenderbufferParameteriv( @@ -137,16 +137,16 @@ TEST_F(GLChromiumFramebufferMultisampleTest, DrawAndResolve) { glBindFramebuffer(GL_DRAW_FRAMEBUFFER, resolve_fbo); glClearColor(1.0f, 0.0f, 0.0f, 0.0f); glClear(GL_COLOR_BUFFER_BIT); - glBlitFramebufferEXT(0, - 0, - width, - height, - 0, - 0, - width, - height, - GL_COLOR_BUFFER_BIT, - GL_NEAREST); + glBlitFramebufferCHROMIUM(0, + 0, + width, + height, + 0, + 0, + width, + height, + GL_COLOR_BUFFER_BIT, + GL_NEAREST); // Verify. const uint8 green[] = {0, 255, 0, 255}; |