| Index: trunk/src/cc/output/gl_renderer.cc
|
| ===================================================================
|
| --- trunk/src/cc/output/gl_renderer.cc (revision 191411)
|
| +++ trunk/src/cc/output/gl_renderer.cc (working copy)
|
| @@ -140,24 +140,23 @@
|
| // Use the SwapBuffers callback only with the threaded proxy.
|
| if (client_->HasImplThread())
|
| capabilities_.using_swap_complete_callback =
|
| - extensions.count("GL_CHROMIUM_swapbuffers_complete_callback") > 0;
|
| + extensions.count("GL_CHROMIUM_swapbuffers_complete_callback");
|
| if (capabilities_.using_swap_complete_callback)
|
| context_->setSwapBuffersCompleteCallbackCHROMIUM(this);
|
|
|
| capabilities_.using_set_visibility =
|
| - extensions.count("GL_CHROMIUM_set_visibility") > 0;
|
| + extensions.count("GL_CHROMIUM_set_visibility");
|
|
|
| - if (extensions.count("GL_CHROMIUM_iosurface") > 0)
|
| - DCHECK(extensions.count("GL_ARB_texture_rectangle") > 0);
|
| + if (extensions.count("GL_CHROMIUM_iosurface"))
|
| + DCHECK(extensions.count("GL_ARB_texture_rectangle"));
|
|
|
| capabilities_.using_gpu_memory_manager =
|
| - extensions.count("GL_CHROMIUM_gpu_memory_manager") > 0 &&
|
| + extensions.count("GL_CHROMIUM_gpu_memory_manager") &&
|
| Settings().use_memory_management;
|
| if (capabilities_.using_gpu_memory_manager)
|
| context_->setMemoryAllocationChangedCallbackCHROMIUM(this);
|
|
|
| - capabilities_.using_egl_image =
|
| - extensions.count("GL_OES_EGL_image_external") > 0;
|
| + capabilities_.using_egl_image = extensions.count("GL_OES_EGL_image_external");
|
|
|
| capabilities_.max_texture_size = resource_provider_->max_texture_size();
|
| capabilities_.best_texture_format = resource_provider_->best_texture_format();
|
| @@ -168,12 +167,12 @@
|
| // Check for texture fast paths. Currently we always use MO8 textures,
|
| // so we only need to avoid POT textures if we have an NPOT fast-path.
|
| capabilities_.avoid_pow2_textures =
|
| - extensions.count("GL_CHROMIUM_fast_NPOT_MO8_textures") > 0;
|
| + extensions.count("GL_CHROMIUM_fast_NPOT_MO8_textures");
|
|
|
| capabilities_.using_offscreen_context3d = true;
|
|
|
| is_using_bind_uniform_ =
|
| - extensions.count("GL_CHROMIUM_bind_uniform_location") > 0;
|
| + extensions.count("GL_CHROMIUM_bind_uniform_location");
|
|
|
| // Make sure scissoring starts as disabled.
|
| GLC(context_, context_->disable(GL_SCISSOR_TEST));
|
|
|