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

Unified Diff: gpu/command_buffer/service/feature_info.cc

Issue 10389107: Implement GL_EXT_occlusion_query_boolean on OSX (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/feature_info.cc
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
index 6be40c42bb5fbdcb58193ec15dc9583214d3fba2..129fb586aa5cd6e6916172217a01ea0af68ef3ef 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -445,12 +445,18 @@ void FeatureInfo::AddFeatures(const char* desired_features) {
bool have_ext_occlusion_query_boolean =
ext.Have("GL_EXT_occlusion_query_boolean");
bool have_arb_occlusion_query2 = ext.Have("GL_ARB_occlusion_query2");
+ bool have_arb_occlusion_query = ext.Have("GL_ARB_occlusion_query");
if (ext.Desire("GL_EXT_occlusion_query_boolean") &&
- (have_ext_occlusion_query_boolean || have_arb_occlusion_query2)) {
+ (have_ext_occlusion_query_boolean ||
+ have_arb_occlusion_query2 ||
+ have_arb_occlusion_query)) {
AddExtensionString("GL_EXT_occlusion_query_boolean");
feature_flags_.occlusion_query_boolean = true;
feature_flags_.use_arb_occlusion_query2_for_occlusion_query_boolean =
- !have_ext_occlusion_query_boolean;
+ !have_ext_occlusion_query_boolean && have_arb_occlusion_query2;
+ feature_flags_.use_arb_occlusion_query_for_occlusion_query_boolean =
+ !have_ext_occlusion_query_boolean && have_arb_occlusion_query &&
+ !have_arb_occlusion_query2;
}
if (ext.Desire("GL_ANGLE_instanced_arrays") &&

Powered by Google App Engine
This is Rietveld 408576698