summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/common
diff options
context:
space:
mode:
authorhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 04:22:33 +0000
committerhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 04:22:33 +0000
commit3f91d1208f47f7fedf7efe0cf2015f517e2cebee (patch)
tree992e1cc70e5f0ea0022489ac563bb88bb9a73a4f /gpu/command_buffer/common
parent5d8b99271fd49595ed6ad075ea128bea550d337d (diff)
downloadchromium_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/command_buffer/common')
-rw-r--r--gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
index e9f4f69..62f1c308 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -179,7 +179,6 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
{0x84F4, "GL_FENCE_CONDITION_NV", },
{0x8366, "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT", },
{0x8365, "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT", },
- {0x84F7, "GL_COMMANDS_COMPLETED_CHROMIUM", },
{0x881E, "GL_LUMINANCE16F_EXT", },
{0x84FA, "GL_UNSIGNED_INT_24_8_OES", },
{0x881F, "GL_LUMINANCE_ALPHA16F_EXT", },
@@ -354,7 +353,6 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
{0x8C93, "GL_ATC_RGBA_EXPLICIT_ALPHA_AMD", },
{0x00000002, "GL_CONTEXT_FLAG_DEBUG_BIT_KHR", },
{0x00000001, "GL_SYNC_FLUSH_COMMANDS_BIT_APPLE", },
- {0x9248, "GL_OVERLAY_TRANSFORM_ROTATE_90_CHROMIUM", },
{0x00000004, "GL_COLOR_BUFFER_BIT2_QCOM", },
{0x1702, "GL_TEXTURE", },
{0x00000008, "GL_COLOR_BUFFER_BIT3_QCOM", },
@@ -387,7 +385,6 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
{0x8DF6, "GL_UNSIGNED_INT_10_10_10_2_OES", },
{0x8230, "GL_RG32F_EXT", },
{0x8DF7, "GL_INT_10_10_10_2_OES", },
- {0x9246, "GL_OVERLAY_TRANSFORM_FLIP_HORIZONTAL_CHROMIUM", },
{0x8B69, "GL_FLOAT_MAT4x2_NV", },
{0x812D, "GL_CLAMP_TO_BORDER_NV", },
{0x812F, "GL_CLAMP_TO_EDGE", },
@@ -607,11 +604,8 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
{0x1F02, "GL_VERSION", },
{0x1F01, "GL_RENDERER", },
{0x1F00, "GL_VENDOR", },
- {0x9247, "GL_OVERLAY_TRANSFORM_FLIP_VERTICAL_CHROMIUM", },
{0x2701, "GL_LINEAR_MIPMAP_NEAREST", },
- {0x9245, "GL_OVERLAY_TRANSFORM_NONE_CHROMIUM", },
{0x92B4, "GL_INVERT_OVG_NV", },
- {0x9249, "GL_OVERLAY_TRANSFORM_ROTATE_180_CHROMIUM", },
{0x0B94, "GL_STENCIL_FAIL", },
{0x8B4C, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS", },
{0x8B4D, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS", },
@@ -640,7 +634,6 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
{0x1004, "GL_TEXTURE_BORDER_COLOR_NV", },
{0x8B48, "GL_SHADER_OBJECT_EXT", },
{0x912F, "GL_TEXTURE_IMMUTABLE_FORMAT_EXT", },
- {0x924A, "GL_OVERLAY_TRANSFORM_ROTATE_270_CHROMIUM", },
{0x20000000, "GL_MULTISAMPLE_BUFFER_BIT5_QCOM", },
{0x0DE1, "GL_TEXTURE_2D", },
{0x80C9, "GL_BLEND_SRC_RGB", },
@@ -1170,8 +1163,7 @@ std::string GLES2Util::GetStringQueryTarget(uint32 value) {
{GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM,
"GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM"},
{GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM,
- "GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM"},
- {GL_COMMANDS_COMPLETED_CHROMIUM, "GL_COMMANDS_COMPLETED_CHROMIUM"}, };
+ "GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM"}, };
return GLES2Util::GetQualifiedEnumString(
string_table, arraysize(string_table), value);
}