From 0e02048933cc0cf7bb62d518414ca142c5a11f07 Mon Sep 17 00:00:00 2001 From: "gman@chromium.org" Date: Wed, 21 Nov 2012 04:51:06 +0000 Subject: Revert 168165 - Revert "Revert 167613 - Cache more GL state both service and client side." This reverts commit 14efc6d257c73271ae0b70d2e71571b335827570. The issue appears to be that glBlitFramebufferANGLE fails if GL_SCISSOR_TEST is enabled and the caching code ends up enabling it places it didn't use to be. That doesn't explain issues on non-Windows machines though. It disable before glBlitFramebufferANGLE and glBlitFramebufferEXT on all machines at the moment. I tried to get the code to fail on Linux NVidia both debug and release and Mac Retina both debug and release and using integrated and discrete but no luck. AFAICT there's no try bots to test Linux Intel or Mac Intel so if this still causes tests to fail feel free to revert it TBR=apatrick@chromium.org,brettw@chromium.org R=shawnsingh@chromium.org BUG=160370 Review URL: https://chromiumcodereview.appspot.com/11415003 TBR=gman@chromium.org Review URL: https://codereview.chromium.org/11280110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168982 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/gpu_common.gypi | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gpu/gpu_common.gypi') diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index f6dd581..24c7e4d 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -19,10 +19,6 @@ # with without support for client side arrays and once with for pepper and # the OpenGL ES 2.0 compliant for the conformance tests. 'gles2_implementation_source_files': [ - 'command_buffer/client/client_context_state.h', - 'command_buffer/client/client_context_state.cc', - 'command_buffer/client/client_context_state_autogen.h', - 'command_buffer/client/client_context_state_impl_autogen.h', 'command_buffer/client/gles2_impl_export.h', 'command_buffer/client/gles2_implementation_autogen.h', 'command_buffer/client/gles2_implementation.cc', -- cgit v1.1