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

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

Issue 2103773002: Occlusion query feature is already in GL ES3.0 spec, not an extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: logical error Created 4 years, 5 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 | no next file » | 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/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
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 1056
xinghua.cao 2016/06/28 10:19:15 On mesa+i965 platform, supports OpenGL ES 3.1, it
1057 if (IsES3Capable()) {
1058 feature_flags_.occlusion_query_boolean = true;
1059 }
Zhenyao Mo 2016/06/28 17:59:05 I think you need to be more careful in these setti
Ken Russell (switch to Gerrit) 2016/06/28 23:58:59 Not sure about that. Is Intel's driver OpenGL ES r
Zhenyao Mo 2016/06/29 00:39:44 My original suggestion was to always map to the ES
xinghua.cao 2016/06/29 10:40:09 It is Intel's driver OpenGL ES. I had changed it,
1057 if (have_ext_occlusion_query_boolean || 1060 if (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");
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;
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698