Chromium Code Reviews| 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/feature_info.h" | 5 #include "gpu/command_buffer/service/feature_info.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1046 GL_LUMINANCE_ALPHA16F_EXT); | 1046 GL_LUMINANCE_ALPHA16F_EXT); |
| 1047 } | 1047 } |
| 1048 } | 1048 } |
| 1049 | 1049 |
| 1050 bool have_ext_occlusion_query_boolean = | 1050 bool have_ext_occlusion_query_boolean = |
| 1051 extensions.Contains("GL_EXT_occlusion_query_boolean"); | 1051 extensions.Contains("GL_EXT_occlusion_query_boolean"); |
| 1052 bool have_arb_occlusion_query2 = | 1052 bool have_arb_occlusion_query2 = |
| 1053 extensions.Contains("GL_ARB_occlusion_query2"); | 1053 extensions.Contains("GL_ARB_occlusion_query2"); |
| 1054 bool have_arb_occlusion_query = | 1054 bool have_arb_occlusion_query = |
| 1055 extensions.Contains("GL_ARB_occlusion_query"); | 1055 extensions.Contains("GL_ARB_occlusion_query"); |
| 1056 bool have_es3_occlusion_query = | |
| 1057 gl_version_info_->IsAtLeastGLES(3, 0); | |
|
yunchao
2016/07/04 02:22:39
This CL is used to fix crbug 623871, I think you c
xinghua.cao
2016/07/04 10:20:30
Yunchao, thanks for your comment. I still think th
| |
| 1056 | 1058 |
| 1057 if (have_ext_occlusion_query_boolean || | 1059 if (have_es3_occlusion_query || |
| 1060 have_ext_occlusion_query_boolean || | |
| 1058 have_arb_occlusion_query2 || | 1061 have_arb_occlusion_query2 || |
| 1059 have_arb_occlusion_query) { | 1062 have_arb_occlusion_query) { |
| 1060 AddExtensionString("GL_EXT_occlusion_query_boolean"); | 1063 AddExtensionString("GL_EXT_occlusion_query_boolean"); |
|
Ken Russell (switch to Gerrit)
2016/06/29 22:29:56
Do we want to add this extension string if we are
xinghua.cao
2016/07/04 10:20:30
Done.
| |
| 1061 feature_flags_.occlusion_query_boolean = true; | 1064 feature_flags_.occlusion_query_boolean = true; |
| 1062 feature_flags_.use_arb_occlusion_query2_for_occlusion_query_boolean = | 1065 feature_flags_.use_arb_occlusion_query2_for_occlusion_query_boolean = |
| 1063 !have_ext_occlusion_query_boolean && have_arb_occlusion_query2; | 1066 !have_ext_occlusion_query_boolean && have_arb_occlusion_query2; |
| 1064 feature_flags_.use_arb_occlusion_query_for_occlusion_query_boolean = | 1067 feature_flags_.use_arb_occlusion_query_for_occlusion_query_boolean = |
| 1065 !have_ext_occlusion_query_boolean && have_arb_occlusion_query && | 1068 !have_ext_occlusion_query_boolean && have_arb_occlusion_query && |
| 1066 !have_arb_occlusion_query2; | 1069 !have_arb_occlusion_query2; |
| 1067 } | 1070 } |
| 1068 | 1071 |
| 1069 if (!workarounds_.disable_angle_instanced_arrays && | 1072 if (!workarounds_.disable_angle_instanced_arrays && |
| 1070 (extensions.Contains("GL_ANGLE_instanced_arrays") || | 1073 (extensions.Contains("GL_ANGLE_instanced_arrays") || |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1415 if (pos == std::string::npos) { | 1418 if (pos == std::string::npos) { |
| 1416 extensions_ += (extensions_.empty() ? "" : " ") + str; | 1419 extensions_ += (extensions_.empty() ? "" : " ") + str; |
| 1417 } | 1420 } |
| 1418 } | 1421 } |
| 1419 | 1422 |
| 1420 FeatureInfo::~FeatureInfo() { | 1423 FeatureInfo::~FeatureInfo() { |
| 1421 } | 1424 } |
| 1422 | 1425 |
| 1423 } // namespace gles2 | 1426 } // namespace gles2 |
| 1424 } // namespace gpu | 1427 } // namespace gpu |
| OLD | NEW |