diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 22:49:17 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 22:49:17 +0000 |
| commit | 35d90072e5c73f4091eeb12f26e6c5015e7597c0 (patch) | |
| tree | cf74f45c43b911d3356b4e7cf387da6916703ddb /gpu/GLES2 | |
| parent | de6ea3ae3c0444d4f0a9f65bb57dbacb8846ce5b (diff) | |
| download | chromium_src-35d90072e5c73f4091eeb12f26e6c5015e7597c0.zip chromium_src-35d90072e5c73f4091eeb12f26e6c5015e7597c0.tar.gz chromium_src-35d90072e5c73f4091eeb12f26e6c5015e7597c0.tar.bz2 | |
Revert 92429 - Detect and expose loss of OpenGL context using GL_ARB_robustness. (Regressed static initalizer size on Linux -- will need to reexamine code to understand why.)
This initial patch changes the Linux port to use
GLX_ARB_create_context_robustness when available, and tests
periodically whether the context has been lost after each draw call
and when making the context current. The detection of context loss
also works with EGL and ANGLE, although it always reports an unknown
reset status.
WebKit changes will follow which test the reset status and determine
what to do in response; for example, the policy might be to never
restore a WebGL context which was lost (due to a GPU reset) and which
was determined to be the guilty context.
Tested manually with WebGL stress tests and verified on Linux and
Windows that in at least some situations it is possible to detect
guilty contexts and shut down the associated WebGL application. Some
precision of this detection was recently lost and will need to be
fixed in following CLs. Also updated and ran GPU unit tests.
BUG=88106
TEST=none (tested manually; try servers)
Review URL: http://codereview.chromium.org/7331020
TBR=kbr@chromium.org
Review URL: http://codereview.chromium.org/7346032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/gl2ext.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/gpu/GLES2/gl2ext.h b/gpu/GLES2/gl2ext.h index 1afb408..7ad5ef1 100644 --- a/gpu/GLES2/gl2ext.h +++ b/gpu/GLES2/gl2ext.h @@ -1010,26 +1010,6 @@ typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUM) (); #endif #endif -/* GL_ARB_robustness */ -/* This extension is subsetted for the moment, incorporating only the - * enums necessary to describe the reasons that we might encounter for - * losing the context. The entry point querying the reset status is - * not yet incorporated; to do so, a spec will be needed of a GLES2 - * subset of GL_ARB_robustness. - */ -#ifndef GL_ARB_robustness -#define GL_ARB_robustness 1 -#ifndef GL_GUILTY_CONTEXT_RESET_ARB -#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 -#endif -#ifndef GL_INNOCENT_CONTEXT_RESET_ARB -#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 -#endif -#ifndef GL_UNKNOWN_CONTEXT_RESET_ARB -#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 -#endif -#endif - #ifdef __cplusplus } #endif |