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/service/gles2_cmd_decoder.h" | 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
6 | 6 |
7 #include <stdio.h> | 7 #include <stdio.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <list> | 10 #include <list> |
(...skipping 9517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
9528 int32 sync_shm_id = static_cast<int32>(c.sync_data_shm_id); | 9528 int32 sync_shm_id = static_cast<int32>(c.sync_data_shm_id); |
9529 uint32 sync_shm_offset = static_cast<uint32>(c.sync_data_shm_offset); | 9529 uint32 sync_shm_offset = static_cast<uint32>(c.sync_data_shm_offset); |
9530 | 9530 |
9531 switch (target) { | 9531 switch (target) { |
9532 case GL_COMMANDS_ISSUED_CHROMIUM: | 9532 case GL_COMMANDS_ISSUED_CHROMIUM: |
9533 case GL_LATENCY_QUERY_CHROMIUM: | 9533 case GL_LATENCY_QUERY_CHROMIUM: |
9534 case GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM: | 9534 case GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM: |
9535 case GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM: | 9535 case GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM: |
9536 case GL_GET_ERROR_QUERY_CHROMIUM: | 9536 case GL_GET_ERROR_QUERY_CHROMIUM: |
9537 break; | 9537 break; |
| 9538 case GL_COMMANDS_COMPLETED_CHROMIUM: |
| 9539 if (!features().chromium_sync_query) { |
| 9540 LOCAL_SET_GL_ERROR( |
| 9541 GL_INVALID_OPERATION, "glBeginQueryEXT", |
| 9542 "not enabled for commands completed queries"); |
| 9543 return error::kNoError; |
| 9544 } |
| 9545 break; |
9538 default: | 9546 default: |
9539 if (!features().occlusion_query_boolean) { | 9547 if (!features().occlusion_query_boolean) { |
9540 LOCAL_SET_GL_ERROR( | 9548 LOCAL_SET_GL_ERROR( |
9541 GL_INVALID_OPERATION, "glBeginQueryEXT", | 9549 GL_INVALID_OPERATION, "glBeginQueryEXT", |
9542 "not enabled for occlusion queries"); | 9550 "not enabled for occlusion queries"); |
9543 return error::kNoError; | 9551 return error::kNoError; |
9544 } | 9552 } |
9545 break; | 9553 break; |
9546 } | 9554 } |
9547 | 9555 |
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
10734 } | 10742 } |
10735 } | 10743 } |
10736 | 10744 |
10737 // Include the auto-generated part of this file. We split this because it means | 10745 // Include the auto-generated part of this file. We split this because it means |
10738 // we can easily edit the non-auto generated parts right here in this file | 10746 // we can easily edit the non-auto generated parts right here in this file |
10739 // instead of having to edit some template or the code generator. | 10747 // instead of having to edit some template or the code generator. |
10740 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" | 10748 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" |
10741 | 10749 |
10742 } // namespace gles2 | 10750 } // namespace gles2 |
10743 } // namespace gpu | 10751 } // namespace gpu |
OLD | NEW |