Merge pull request #2414 from yuriks/texture-decode

Texture decoding cleanups

1 files changed, 20 insertions, 16 deletions

diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index d55b84ce0..ad984cd94 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -1,36 +1,30 @@
 set(SRCS
-            renderer_opengl/gl_rasterizer.cpp
-            renderer_opengl/gl_rasterizer_cache.cpp
-            renderer_opengl/gl_shader_gen.cpp
-            renderer_opengl/gl_shader_util.cpp
-            renderer_opengl/gl_state.cpp
-            renderer_opengl/renderer_opengl.cpp
-            debug_utils/debug_utils.cpp
             clipper.cpp
             command_processor.cpp
+            debug_utils/debug_utils.cpp
             pica.cpp
             primitive_assembly.cpp
             rasterizer.cpp
             renderer_base.cpp
+            renderer_opengl/gl_rasterizer.cpp
+            renderer_opengl/gl_rasterizer_cache.cpp
+            renderer_opengl/gl_shader_gen.cpp
+            renderer_opengl/gl_shader_util.cpp
+            renderer_opengl/gl_state.cpp
+            renderer_opengl/renderer_opengl.cpp
             shader/shader.cpp
             shader/shader_interpreter.cpp
             swrasterizer.cpp
+            texture/etc1.cpp
+            texture/texture_decode.cpp
             vertex_loader.cpp
             video_core.cpp
             )
 
 set(HEADERS
-            debug_utils/debug_utils.h
-            renderer_opengl/gl_rasterizer.h
-            renderer_opengl/gl_rasterizer_cache.h
-            renderer_opengl/gl_resource_manager.h
-            renderer_opengl/gl_shader_gen.h
-            renderer_opengl/gl_shader_util.h
-            renderer_opengl/gl_state.h
-            renderer_opengl/pica_to_gl.h
-            renderer_opengl/renderer_opengl.h
             clipper.h
             command_processor.h
+            debug_utils/debug_utils.h
             gpu_debugger.h
             pica.h
             pica_state.h
@@ -39,10 +33,20 @@ set(HEADERS
             rasterizer.h
             rasterizer_interface.h
             renderer_base.h
+            renderer_opengl/gl_rasterizer.h
+            renderer_opengl/gl_rasterizer_cache.h
+            renderer_opengl/gl_resource_manager.h
+            renderer_opengl/gl_shader_gen.h
+            renderer_opengl/gl_shader_util.h
+            renderer_opengl/gl_state.h
+            renderer_opengl/pica_to_gl.h
+            renderer_opengl/renderer_opengl.h
             shader/debug_data.h
             shader/shader.h
             shader/shader_interpreter.h
             swrasterizer.h
+            texture/etc1.h
+            texture/texture_decode.h
             utils.h
             vertex_loader.h
             video_core.h