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

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

Issue 7604027: Expose DXT3 and DXT5 through ANGLE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 4 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
« no previous file with comments | « gpu/command_buffer/client/gles2_demo_cc.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 21e4550d6b5fd529318a7ce7497aa1727d97d9fd..251e7f437d0170e96665bfb376567eb5b5256796 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -121,15 +121,17 @@ void FeatureInfo::AddFeatures(const char* desired_features) {
bool enable_dxt3 = false;
bool enable_dxt5 = false;
bool have_s3tc = ext.Have("GL_EXT_texture_compression_s3tc");
+ bool have_dxt3 = have_s3tc || ext.Have("GL_ANGLE_texture_compression_dxt3");
+ bool have_dxt5 = have_s3tc || ext.Have("GL_ANGLE_texture_compression_dxt5");
if (ext.Desire("GL_EXT_texture_compression_dxt1") &&
(ext.Have("GL_EXT_texture_compression_dxt1") || have_s3tc)) {
enable_dxt1 = true;
}
- if (have_s3tc && ext.Desire("GL_CHROMIUM_texture_compression_dxt3")) {
+ if (have_dxt3 && ext.Desire("GL_CHROMIUM_texture_compression_dxt3")) {
enable_dxt3 = true;
}
- if (have_s3tc && ext.Desire("GL_CHROMIUM_texture_compression_dxt5")) {
+ if (have_dxt5 && ext.Desire("GL_CHROMIUM_texture_compression_dxt5")) {
enable_dxt5 = true;
}
« no previous file with comments | « gpu/command_buffer/client/gles2_demo_cc.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698