Temporarily crash the GPU process when unexpected failures happen.

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 7b5b57b58b59dfee94b835a3262cfdc38abc14b4..d782b6c6d9753a7b36361658572467f7dcf4aea5 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -11605,6 +11605,26 @@ error::Error GLES2DecoderImpl::HandleBeginQueryEXT(uint32 immediate_data_size,
       break;
     case GL_COMMANDS_COMPLETED_CHROMIUM:
       if (!features().chromium_sync_query) {
+#if defined(OS_MACOSX)
+        // TODO(dyen): Remove once we know what is failing.
+        uint32_t boolean_flags = 0;
+        if (gfx::g_driver_gl.ext.b_GL_ARB_sync)
+          boolean_flags |= 1;
+        if (gfx::g_driver_gl.ext.b_GL_APPLE_fence)
+          boolean_flags |= 2;
+        if (gfx::g_driver_gl.ext.b_GL_NV_fence)
+          boolean_flags |= 4;
+
+        CHECK(boolean_flags != 0) << "Nothing supported";
+        CHECK(boolean_flags != 1) << "ARB";
+        CHECK(boolean_flags != 2) << "APPLE";
+        CHECK(boolean_flags != 3) << "ARB APPLE";
+        CHECK(boolean_flags != 4) << "NV";
+        CHECK(boolean_flags != 5) << "NV ARB";
+        CHECK(boolean_flags != 6) << "NV APPLE";
+        CHECK(boolean_flags != 7) << "NV ARB APPLE";
+        CHECK(false) << "Unknown error.";

[piman, 2015/07/21 19:17:05]

drive-by FYI: you can use base::debug::Alias to make sure a particular stack
variable is not optimized, so you can observe it from the crash dump.

+#endif
         LOCAL_SET_GL_ERROR(
             GL_INVALID_OPERATION, "glBeginQueryEXT",
             "not enabled for commands completed queries");
@@ -11637,12 +11657,21 @@ error::Error GLES2DecoderImpl::HandleBeginQueryEXT(uint32 immediate_data_size,
   }
 
   if (state_.current_queries.find(target) != state_.current_queries.end()) {
+#if defined(OS_MACOSX)
+    // TODO(dyen): Remove once we know what is failing.
+    CHECK(target != GL_COMMANDS_COMPLETED_CHROMIUM)
+        << "Query already in progress";
+#endif
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, "glBeginQueryEXT", "query already in progress");
     return error::kNoError;
   }
 
   if (client_id == 0) {
+#if defined(OS_MACOSX)
+    // TODO(dyen): Remove once we know what is failing.
+    CHECK(target != GL_COMMANDS_COMPLETED_CHROMIUM) << "Id is 0";
+#endif
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glBeginQueryEXT", "id is 0");
     return error::kNoError;
   }
@@ -11650,6 +11679,10 @@ error::Error GLES2DecoderImpl::HandleBeginQueryEXT(uint32 immediate_data_size,
   QueryManager::Query* query = query_manager_->GetQuery(client_id);
   if (!query) {
     if (!query_manager_->IsValidQuery(client_id)) {
+#if defined(OS_MACOSX)
+      // TODO(dyen): Remove once we know what is failing.
+      CHECK(target != GL_COMMANDS_COMPLETED_CHROMIUM) << "Invalid ID";
+#endif
       LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
                          "glBeginQueryEXT",
                          "id not made by glGenQueriesEXT");
@@ -11660,6 +11693,10 @@ error::Error GLES2DecoderImpl::HandleBeginQueryEXT(uint32 immediate_data_size,
   }
 
   if (query->target() != target) {
+#if defined(OS_MACOSX)
+    // TODO(dyen): Remove once we know what is failing.
+    CHECK(target != GL_COMMANDS_COMPLETED_CHROMIUM) << "Non-Matching Target";
+#endif
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, "glBeginQueryEXT", "target does not match");
     return error::kNoError;