Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 2592253002: Disallow GL_SAMPLES_PASSED as a query target. (Closed)
Patch Set: Made the unit test actually work. Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <stdio.h> 10 #include <stdio.h>
(...skipping 15858 matching lines...) Expand 10 before | Expand all | Expand 10 after
15869 case GL_GET_ERROR_QUERY_CHROMIUM: 15869 case GL_GET_ERROR_QUERY_CHROMIUM:
15870 break; 15870 break;
15871 case GL_COMMANDS_COMPLETED_CHROMIUM: 15871 case GL_COMMANDS_COMPLETED_CHROMIUM:
15872 if (!features().chromium_sync_query) { 15872 if (!features().chromium_sync_query) {
15873 LOCAL_SET_GL_ERROR( 15873 LOCAL_SET_GL_ERROR(
15874 GL_INVALID_OPERATION, "glBeginQueryEXT", 15874 GL_INVALID_OPERATION, "glBeginQueryEXT",
15875 "not enabled for commands completed queries"); 15875 "not enabled for commands completed queries");
15876 return error::kNoError; 15876 return error::kNoError;
15877 } 15877 }
15878 break; 15878 break;
15879 case GL_SAMPLES_PASSED:
15880 case GL_ANY_SAMPLES_PASSED: 15879 case GL_ANY_SAMPLES_PASSED:
15881 case GL_ANY_SAMPLES_PASSED_CONSERVATIVE: 15880 case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
15882 if (!features().occlusion_query_boolean) { 15881 if (!features().occlusion_query_boolean) {
15883 LOCAL_SET_GL_ERROR( 15882 LOCAL_SET_GL_ERROR(
15884 GL_INVALID_OPERATION, "glBeginQueryEXT", 15883 GL_INVALID_OPERATION, "glBeginQueryEXT",
15885 "not enabled for occlusion queries"); 15884 "not enabled for occlusion queries");
15886 return error::kNoError; 15885 return error::kNoError;
15887 } 15886 }
15888 break; 15887 break;
15889 case GL_TIME_ELAPSED: 15888 case GL_TIME_ELAPSED:
(...skipping 3225 matching lines...) Expand 10 before | Expand all | Expand 10 after
19115 } 19114 }
19116 19115
19117 // Include the auto-generated part of this file. We split this because it means 19116 // Include the auto-generated part of this file. We split this because it means
19118 // we can easily edit the non-auto generated parts right here in this file 19117 // we can easily edit the non-auto generated parts right here in this file
19119 // instead of having to edit some template or the code generator. 19118 // instead of having to edit some template or the code generator.
19120 #include "base/macros.h" 19119 #include "base/macros.h"
19121 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 19120 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
19122 19121
19123 } // namespace gles2 19122 } // namespace gles2
19124 } // namespace gpu 19123 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698