diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:56:19 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:56:19 +0000 |
| commit | 878412f29e4b9fcff06fd9102174f9e473995b93 (patch) | |
| tree | 353ed5be49dc6619c3565c40a136244a190736e5 /gpu/gpu_common.gypi | |
| parent | 8d0004c57603e480cc9792756c3125dafd828d68 (diff) | |
| download | chromium_src-878412f29e4b9fcff06fd9102174f9e473995b93.zip chromium_src-878412f29e4b9fcff06fd9102174f9e473995b93.tar.gz chromium_src-878412f29e4b9fcff06fd9102174f9e473995b93.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu_common.gypi')
| -rw-r--r-- | gpu/gpu_common.gypi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index 24c7e4d..f6dd581 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -19,6 +19,10 @@ # 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', |