Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / gpu / command_buffer / service / error_state.cc

diff --git a/src/gpu/command_buffer/service/error_state.cc b/src/gpu/command_buffer/service/error_state.cc
index ce65aa1..ca4af85 100644 (file)
--- a/src/gpu/command_buffer/service/error_state.cc
+++ b/src/gpu/command_buffer/service/error_state.cc
@@ -17,47 +17,48 @@ namespace gles2 {
 class ErrorStateImpl : public ErrorState {
  public:
   explicit ErrorStateImpl(ErrorStateClient* client, Logger* logger);
-  virtual ~ErrorStateImpl();
-
-  virtual uint32 GetGLError() OVERRIDE;
-
-  virtual void SetGLError(
-      const char* filename,
-      int line,
-      unsigned int error,
-      const char* function_name,
-      const char* msg) OVERRIDE;
-  virtual void SetGLErrorInvalidEnum(
-      const char* filename,
-      int line,
-      const char* function_name,
-      unsigned int value,
-      const char* label) OVERRIDE;
-  virtual void SetGLErrorInvalidParami(
-      const char* filename,
-      int line,
-      unsigned int error,
-      const char* function_name,
-      unsigned int pname,
-      int param) OVERRIDE;
-  virtual void SetGLErrorInvalidParamf(
-      const char* filename,
-      int line,
-      unsigned int error,
-      const char* function_name,
-      unsigned int pname,
-      float param) OVERRIDE;
-
-  virtual unsigned int PeekGLError(
-      const char* filename, int line, const char* function_name) OVERRIDE;
-
-  virtual void CopyRealGLErrorsToWrapper(
-      const char* filename, int line, const char* function_name) OVERRIDE;
-
-  virtual void ClearRealGLErrors(
-      const char* filename, int line, const char* function_name) OVERRIDE;
+  ~ErrorStateImpl() override;
+
+  uint32 GetGLError() override;
+
+  void SetGLError(const char* filename,
+                  int line,
+                  unsigned int error,
+                  const char* function_name,
+                  const char* msg) override;
+  void SetGLErrorInvalidEnum(const char* filename,
+                             int line,
+                             const char* function_name,
+                             unsigned int value,
+                             const char* label) override;
+  void SetGLErrorInvalidParami(const char* filename,
+                               int line,
+                               unsigned int error,
+                               const char* function_name,
+                               unsigned int pname,
+                               int param) override;
+  void SetGLErrorInvalidParamf(const char* filename,
+                               int line,
+                               unsigned int error,
+                               const char* function_name,
+                               unsigned int pname,
+                               float param) override;
+
+  unsigned int PeekGLError(const char* filename,
+                           int line,
+                           const char* function_name) override;
+
+  void CopyRealGLErrorsToWrapper(const char* filename,
+                                 int line,
+                                 const char* function_name) override;
+
+  void ClearRealGLErrors(const char* filename,
+                         int line,
+                         const char* function_name) override;
 
  private:
+  GLenum GetErrorHandleContextLoss();
+
   // The last error message set.
   std::string last_error_;
   // Current GL error bits.
@@ -84,7 +85,7 @@ ErrorStateImpl::~ErrorStateImpl() {}
 
 uint32 ErrorStateImpl::GetGLError() {
   // Check the GL error first, then our wrapped error.
-  GLenum error = glGetError();
+  GLenum error = GetErrorHandleContextLoss();
   if (error == GL_NO_ERROR && error_bits_ != 0) {
     for (uint32 mask = 1; mask != 0; mask = mask << 1) {
       if ((error_bits_ & mask) != 0) {
@@ -101,9 +102,21 @@ uint32 ErrorStateImpl::GetGLError() {
   return error;
 }
 
+GLenum ErrorStateImpl::GetErrorHandleContextLoss() {
+  GLenum error = glGetError();
+  if (error == GL_CONTEXT_LOST_KHR) {
+    client_->OnContextLostError();
+    // Do not expose GL_CONTEXT_LOST_KHR, as the version of the robustness
+    // extension that introduces the error is not exposed by the command
+    // buffer.
+    error = GL_NO_ERROR;
+  }
+  return error;
+}
+
 unsigned int ErrorStateImpl::PeekGLError(
     const char* filename, int line, const char* function_name) {
-  GLenum error = glGetError();
+  GLenum error = GetErrorHandleContextLoss();
   if (error != GL_NO_ERROR) {
     SetGLError(filename, line, error, function_name, "");
   }
@@ -177,7 +190,7 @@ void ErrorStateImpl::SetGLErrorInvalidParamf(
 void ErrorStateImpl::CopyRealGLErrorsToWrapper(
     const char* filename, int line, const char* function_name) {
   GLenum error;
-  while ((error = glGetError()) != GL_NO_ERROR) {
+  while ((error = GetErrorHandleContextLoss()) != GL_NO_ERROR) {
     SetGLError(filename, line, error, function_name,
                "<- error from previous GL command");
   }
@@ -188,7 +201,7 @@ void ErrorStateImpl::ClearRealGLErrors(
   // Clears and logs all current gl errors.
   GLenum error;
   while ((error = glGetError()) != GL_NO_ERROR) {
-    if (error != GL_OUT_OF_MEMORY) {
+    if (error != GL_CONTEXT_LOST_KHR && error != GL_OUT_OF_MEMORY) {
       // GL_OUT_OF_MEMORY can legally happen on lost device.
       logger_->LogMessage(
           filename, line,