diff options
author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 04:22:33 +0000 |
---|---|---|
committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 04:22:33 +0000 |
commit | 3f91d1208f47f7fedf7efe0cf2015f517e2cebee (patch) | |
tree | 992e1cc70e5f0ea0022489ac563bb88bb9a73a4f /gpu/GLES2 | |
parent | 5d8b99271fd49595ed6ad075ea128bea550d337d (diff) | |
download | chromium_src-3f91d1208f47f7fedf7efe0cf2015f517e2cebee.zip chromium_src-3f91d1208f47f7fedf7efe0cf2015f517e2cebee.tar.gz chromium_src-3f91d1208f47f7fedf7efe0cf2015f517e2cebee.tar.bz2 |
Revert of gpu: Add CHROMIUM_sync_query extension. (https://codereview.chromium.org/238933003/)
Reason for revert:
[gardening]
Seems that QueryTest.SyncQueryBasic started to fail on Android Tests (dbug).
http://build.chromium.org/p/chromium.webkit/builders/Android%20Tests%20%28dbg%29
http://build.chromium.org/p/chromium.webkit/builders/Android%20Tests%20%28dbg%29/builds/18673/steps/gl_tests/logs/stdio
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from QueryTest
[ RUN ] QueryTest.SyncQueryBasic
../../gpu/command_buffer/tests/gl_query_unittest.cc:154: Failure
Value of: GLTestHelper::HasExtension("GL_CHROMIUM_sync_query")
Actual: false
Expected: true
[0417/014324:ERROR:gles2_cmd_decoder.cc(9542)] [GroupMarkerNotSet(crbug.com/242999)!:04B0A600]GL ERROR :GL_INVALID_OPERATION : glBeginQueryEXT: not enabled for commands completed queries
[0417/014324:ERROR:gles2_cmd_decoder.cc(9617)] [GroupMarkerNotSet(crbug.com/242999)!:04B0A600]GL ERROR :GL_INVALID_OPERATION : glEndQueryEXT: No active query
../../gpu/command_buffer/tests/gl_query_unittest.cc:166: Failure
Value of: available
Actual: false
Expected: true
../../gpu/command_buffer/tests/gl_manager.cc:241: Failure
Value of: glGetError() == GL_NONE
Actual: false
Expected: true
[ FAILED ] QueryTest.SyncQueryBasic (70 ms)
[----------] 1 test from QueryTest (71 ms total)
[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (71 ms total)
[ PASSED ] 0 tests.
[ FAILED ] 1 test, listed below:
[ FAILED ] QueryTest.SyncQueryBasic
In range 264168:264191, this patch might be the culprit.
Let me revert this patch and watch whether Android Tests will cycle to green or not.
Original issue's description:
> gpu: Add CHROMIUM_sync_query extension.
>
> This adds a GL_COMMANDS_COMPLETED_CHROMIUM query target that provide
> a finer granularity of synchronizing GL command completion than offered
> by glFinish().
>
> BUG=269808,356871,273274
> TEST=gpu_unittests --gtest_filter=GLES2DecoderManualInitTest.BeginEndQueryEXTCommandsCompletedCHROMIUM
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=264173
TBR=piman@chromium.org,epenner@chromium.org,sievers@chromium.org,reveman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=269808,356871,273274
Review URL: https://codereview.chromium.org/240273006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
-rw-r--r-- | gpu/GLES2/extensions/CHROMIUM/CHROMIUM_sync_query.txt | 53 | ||||
-rw-r--r-- | gpu/GLES2/gl2extchromium.h | 9 |
2 files changed, 0 insertions, 62 deletions
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_sync_query.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_sync_query.txt deleted file mode 100644 index 98763d0..0000000 --- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_sync_query.txt +++ /dev/null @@ -1,53 +0,0 @@ -Name - - CHROMIUM_sync_query - -Name Strings - - GL_CHROMIUM_sync_query - -Version - - Last Modifed Date: April 15, 2014 - -Dependencies - - OpenGL ES 2.0 is required. - - EXT_occlusion_query_boolean is required. - -Overview - - This extension provides a query mechanism that allow for synchronization - between the host CPU and the GPU, which may be accessing the same - resources (typically memory). - - This extension is useful in conjunction with CHROMIUM_map_image to - determine when it is safe to access a mapped image. Once the result of - a COMMANDS_COMPLETED_CHROMIUM query is available, all drawing commands - issued before the query must have finished. This ensures that the memory - corresponding to the issued commands can be safely modified (assuming no - other outstanding drawing commands are issued subsequent to the query). - -New Procedures and Functions - - None. - -Errors - - None. - -New Tokens - - Accepted by the <target> parameter of BeginQueryEXT, EndQueryEXT, - and GetQueryivEXT: - - COMMANDS_COMPLETED_CHROMIUM 0x84F7 - -New State - - None. - -Revision History - - 4/15/2014 Documented the extension diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h index 0bdf717..db4f12f 100644 --- a/gpu/GLES2/gl2extchromium.h +++ b/gpu/GLES2/gl2extchromium.h @@ -692,15 +692,6 @@ typedef void(GL_APIENTRYP PFNGLSCHEDULEOVERLAYPLANECHROMIUMPROC)( GLfloat uv_height); #endif /* GL_CHROMIUM_schedule_overlay_plane */ -/* GL_CHROMIUM_sync_query */ -#ifndef GL_CHROMIUM_sync_query -#define GL_CHROMIUM_sync_query 1 - -#ifndef GL_COMMANDS_COMPLETED_CHROMIUM -#define GL_COMMANDS_COMPLETED_CHROMIUM 0x84F7 -#endif -#endif /* GL_CHROMIUM_sync_query */ - #ifdef __cplusplus } #endif |