command buffer: tweak error messages for a few more ES3 commands

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 15260 matching lines @@
   if (!result) {
     return error::kOutOfBounds;
   }
   // Check that the client initialized the result.
   if (result->success != 0) {
     return error::kInvalidArguments;
   }
   Program* program = GetProgramInfoNotShader(
       program_id, "glGetTransformFeedbackVarying");
   if (!program) {
+    // An error is already set.
     return error::kNoError;
   }
   GLuint service_id = program->service_id();
   GLint link_status = GL_FALSE;
   glGetProgramiv(service_id, GL_LINK_STATUS, &link_status);
   if (link_status != GL_TRUE) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
         "glGetTransformFeedbackVarying", "program not linked");
     return error::kNoError;
   }
@@ skipping 1916 matching lines @@
 
   GLenum status = glClientWaitSync(service_sync, flags, timeout);
   switch (status) {
     case GL_ALREADY_SIGNALED:
     case GL_TIMEOUT_EXPIRED:
     case GL_CONDITION_SATISFIED:
       break;
     case GL_WAIT_FAILED:
       // Avoid leaking GL errors when using virtual contexts.
       LOCAL_PEEK_GL_ERROR(function_name);
-      break;
+      *result_dst = status;
+      // If validation is complete, this only happens if the context is lost.
+      return error::kLostContext;
     default:
       NOTREACHED();
       break;
   }
   *result_dst = status;
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleWaitSync(uint32_t immediate_data_size,
                                               const volatile void* cmd_data) {
@@ skipping 154 matching lines @@
   }
   if (*result != 0) {
     *result = 0;
     return error::kInvalidArguments;
   }
   if (!validators_->buffer_target.IsValid(target)) {
     LOCAL_SET_GL_ERROR_INVALID_ENUM(func_name, target, "target");
     return error::kNoError;
   }
   if (size == 0) {
-    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, func_name, "size is zero");
+    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, func_name, "length is zero");
     return error::kNoError;
   }
   Buffer* buffer = buffer_manager()->RequestBufferAccess(
       &state_, target, offset, size, func_name);
   if (!buffer) {
+    // An error is already set.
     return error::kNoError;
   }
   if (state_.bound_transform_feedback->active() &&
       !state_.bound_transform_feedback->paused()) {
     size_t used_binding_count =
         state_.current_program->effective_transform_feedback_varyings().size();
     if (state_.bound_transform_feedback->UsesBuffer(
             used_binding_count, buffer)) {
       LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, func_name,
                          "active transform feedback is using this buffer");
@@ skipping 10 matching lines @@
                                GL_MAP_WRITE_BIT |
                                GL_MAP_INVALIDATE_RANGE_BIT |
                                GL_MAP_INVALIDATE_BUFFER_BIT |
                                GL_MAP_FLUSH_EXPLICIT_BIT |
                                GL_MAP_UNSYNCHRONIZED_BIT))) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, func_name, "invalid access bits");
     return error::kNoError;
   }
   if (!AnyBitsSet(access, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, func_name,
-        "neither MAP_READ_BIT nore MAP_WRITE_BIT is set");
+        "neither MAP_READ_BIT nor MAP_WRITE_BIT is set");
     return error::kNoError;
   }
   if (AllBitsSet(access, GL_MAP_READ_BIT) &&
       AnyBitsSet(access, (GL_MAP_INVALIDATE_RANGE_BIT |
                           GL_MAP_INVALIDATE_BUFFER_BIT |
                           GL_MAP_UNSYNCHRONIZED_BIT))) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, func_name,
-        "Incompatible access bits with MAP_READ_BIT");
+        "incompatible access bits with MAP_READ_BIT");
     return error::kNoError;
   }
   if (AllBitsSet(access, GL_MAP_FLUSH_EXPLICIT_BIT) &&
       !AllBitsSet(access, GL_MAP_WRITE_BIT)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, func_name,
         "MAP_FLUSH_EXPLICIT_BIT set without MAP_WRITE_BIT");
     return error::kNoError;
   }
   if (AllBitsSet(access, GL_MAP_INVALIDATE_BUFFER_BIT)) {
     // To be on the safe side, always map GL_MAP_INVALIDATE_BUFFER_BIT to
     // GL_MAP_INVALIDATE_RANGE_BIT.
     access = (access & ~GL_MAP_INVALIDATE_BUFFER_BIT);
     access = (access | GL_MAP_INVALIDATE_RANGE_BIT);
   }
   // Always filter out GL_MAP_UNSYNCHRONIZED_BIT to get rid of undefined
   // behaviors.
   access = (access & ~GL_MAP_UNSYNCHRONIZED_BIT);
   if (AllBitsSet(access, GL_MAP_WRITE_BIT) &&
       !AllBitsSet(access, GL_MAP_INVALIDATE_RANGE_BIT)) {
     access = (access | GL_MAP_READ_BIT);
   }
   void* ptr = glMapBufferRange(target, offset, size, access);
   if (ptr == nullptr) {
+    // This should mean GL_OUT_OF_MEMORY (or context loss).
+    LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER(func_name);
     return error::kNoError;
   }
   buffer->SetMappedRange(offset, size, access, ptr,
                          GetSharedMemoryBuffer(data_shm_id),
                          static_cast<unsigned int>(data_shm_offset));
   if ((access & GL_MAP_INVALIDATE_RANGE_BIT) == 0) {
     memcpy(mem, ptr, size);
   }
   *result = 1;
   return error::kNoError;
@@ skipping 1290 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu