| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/command_buffer/client/query_tracker.h" | 5 #include "gpu/command_buffer/client/query_tracker.h" |
| 6 | 6 |
| 7 #include <GLES2/gl2.h> | 7 #include <GLES2/gl2.h> |
| 8 #include <GLES2/gl2ext.h> | 8 #include <GLES2/gl2ext.h> |
| 9 #include <GLES2/gl2extchromium.h> | 9 #include <GLES2/gl2extchromium.h> |
| 10 | 10 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 gl->helper()->BeginQueryEXT(target(), id(), shm_id(), shm_offset()); | 119 gl->helper()->BeginQueryEXT(target(), id(), shm_id(), shm_offset()); |
| 120 break; | 120 break; |
| 121 } | 121 } |
| 122 } | 122 } |
| 123 | 123 |
| 124 void QueryTracker::Query::End(GLES2Implementation* gl) { | 124 void QueryTracker::Query::End(GLES2Implementation* gl) { |
| 125 switch (target()) { | 125 switch (target()) { |
| 126 case GL_GET_ERROR_QUERY_CHROMIUM: { | 126 case GL_GET_ERROR_QUERY_CHROMIUM: { |
| 127 GLenum error = gl->GetClientSideGLError(); | 127 GLenum error = gl->GetClientSideGLError(); |
| 128 if (error == GL_NO_ERROR) { | 128 if (error == GL_NO_ERROR) { |
| 129 // There was no error so start the query on the serivce. | 129 // There was no error so start the query on the service. |
| 130 // it will end immediately. | 130 // it will end immediately. |
| 131 gl->helper()->BeginQueryEXT(target(), id(), shm_id(), shm_offset()); | 131 gl->helper()->BeginQueryEXT(target(), id(), shm_id(), shm_offset()); |
| 132 } else { | 132 } else { |
| 133 // There's an error on the client, no need to bother the service. just | 133 // There's an error on the client, no need to bother the service. Just |
| 134 // set the query as completed and return the error. | 134 // set the query as completed and return the error. |
| 135 if (error != GL_NO_ERROR) { | 135 if (error != GL_NO_ERROR) { |
| 136 state_ = kComplete; | 136 state_ = kComplete; |
| 137 result_ = error; | 137 result_ = error; |
| 138 return; | 138 return; |
| 139 } | 139 } |
| 140 } | 140 } |
| 141 } | 141 } |
| 142 } | 142 } |
| 143 flush_count_ = gl->helper()->flush_generation(); | 143 flush_count_ = gl->helper()->flush_generation(); |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 } | 251 } |
| 252 | 252 |
| 253 query_sync_manager_.Free(query->info_); | 253 query_sync_manager_.Free(query->info_); |
| 254 it = removed_queries_.erase(it); | 254 it = removed_queries_.erase(it); |
| 255 delete query; | 255 delete query; |
| 256 } | 256 } |
| 257 } | 257 } |
| 258 | 258 |
| 259 } // namespace gles2 | 259 } // namespace gles2 |
| 260 } // namespace gpu | 260 } // namespace gpu |
| OLD | NEW |