Chromium Code Reviews| Index: ui/gl/gl_bindings_autogen_gl.cc |
| diff --git a/ui/gl/gl_bindings_autogen_gl.cc b/ui/gl/gl_bindings_autogen_gl.cc |
| index 642190c0e7a4eb208ddc2d1465c7ef38f72e4787..11383b15a15cbd7adccc7a9b25ee9c80dbd14342 100644 |
| --- a/ui/gl/gl_bindings_autogen_gl.cc |
| +++ b/ui/gl/gl_bindings_autogen_gl.cc |
| @@ -1692,12 +1692,7 @@ void DriverGL::InitializeDynamicBindings(GLContext* context) { |
| } |
| debug_fn.glRenderbufferStorageMultisampleANGLEFn = 0; |
| - if (ver->IsAtLeastGL(3u, 0u) || ver->IsAtLeastGLES(3u, 0u)) { |
| - fn.glRenderbufferStorageMultisampleANGLEFn = |
| - reinterpret_cast<glRenderbufferStorageMultisampleANGLEProc>( |
| - GetGLProcAddress("glRenderbufferStorageMultisample")); |
| - DCHECK(fn.glRenderbufferStorageMultisampleANGLEFn); |
| - } else if (ext.b_GL_ANGLE_framebuffer_multisample) { |
| + if (ext.b_GL_ANGLE_framebuffer_multisample) { |
| fn.glRenderbufferStorageMultisampleANGLEFn = |
| reinterpret_cast<glRenderbufferStorageMultisampleANGLEProc>( |
| GetGLProcAddress("glRenderbufferStorageMultisampleANGLE")); |
| @@ -1705,13 +1700,8 @@ void DriverGL::InitializeDynamicBindings(GLContext* context) { |
| } |
| debug_fn.glRenderbufferStorageMultisampleEXTFn = 0; |
| - if (ver->IsAtLeastGL(3u, 0u) || ver->IsAtLeastGLES(3u, 0u)) { |
| - fn.glRenderbufferStorageMultisampleEXTFn = |
| - reinterpret_cast<glRenderbufferStorageMultisampleEXTProc>( |
| - GetGLProcAddress("glRenderbufferStorageMultisample")); |
| - DCHECK(fn.glRenderbufferStorageMultisampleEXTFn); |
|
no sievers
2015/02/03 21:39:41
The problem was caused by us falling into here on
|
| - } else if (ext.b_GL_EXT_multisampled_render_to_texture || |
| - ext.b_GL_EXT_framebuffer_multisample) { |
| + if (ext.b_GL_EXT_multisampled_render_to_texture || |
| + ext.b_GL_EXT_framebuffer_multisample) { |
| fn.glRenderbufferStorageMultisampleEXTFn = |
| reinterpret_cast<glRenderbufferStorageMultisampleEXTProc>( |
| GetGLProcAddress("glRenderbufferStorageMultisampleEXT")); |