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

Unified Diff: cc/resources/texture_compressor.cc

Issue 1136083003: Revert of Add ETC1 powered SSE encoder for tile texture compression (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/resources/texture_compressor_etc1.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/texture_compressor.cc
diff --git a/cc/resources/texture_compressor.cc b/cc/resources/texture_compressor.cc
index a32615cb7a5b1930b43d8b3c8ae046a39c88b929..186a47d04b65a7d9539b033a61b5c8d35c1d01f9 100644
--- a/cc/resources/texture_compressor.cc
+++ b/cc/resources/texture_compressor.cc
@@ -7,24 +7,12 @@
#include "base/logging.h"
#include "cc/resources/texture_compressor_etc1.h"
-#if defined(ARCH_CPU_X86_FAMILY)
-#include "base/cpu.h"
-#include "cc/resources/texture_compressor_etc1_sse.h"
-#endif
-
namespace cc {
scoped_ptr<TextureCompressor> TextureCompressor::Create(Format format) {
switch (format) {
- case kFormatETC1: {
-#if defined(ARCH_CPU_X86_FAMILY)
- base::CPU cpu;
- if (cpu.has_sse2()) {
- return make_scoped_ptr(new TextureCompressorETC1SSE());
- }
-#endif
+ case kFormatETC1:
return make_scoped_ptr(new TextureCompressorETC1());
- }
}
NOTREACHED();
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/resources/texture_compressor_etc1.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698