Browse Source

Move video_core/color.h to common/color.h

pull/15/merge
archshift 11 years ago
parent
commit
76690392bf
  1. 3
      src/citra_qt/debugger/graphics_framebuffer.cpp
  2. 1
      src/common/CMakeLists.txt
  3. 0
      src/common/color.h
  4. 2
      src/core/hw/gpu.cpp
  5. 1
      src/video_core/CMakeLists.txt
  6. 2
      src/video_core/debug_utils/debug_utils.cpp
  7. 2
      src/video_core/rasterizer.cpp
  8. 3
      src/video_core/renderer_opengl/gl_rasterizer.cpp

3
src/citra_qt/debugger/graphics_framebuffer.cpp

@ -9,10 +9,11 @@
#include <QPushButton> #include <QPushButton>
#include <QSpinBox> #include <QSpinBox>
#include "common/color.h"
#include "core/hw/gpu.h" #include "core/hw/gpu.h"
#include "core/memory.h" #include "core/memory.h"
#include "video_core/color.h"
#include "video_core/pica.h" #include "video_core/pica.h"
#include "video_core/utils.h" #include "video_core/utils.h"

1
src/common/CMakeLists.txt

@ -24,6 +24,7 @@ set(HEADERS
bit_field.h bit_field.h
break_points.h break_points.h
chunk_file.h chunk_file.h
color.h
common_funcs.h common_funcs.h
common_paths.h common_paths.h
common_types.h common_types.h

0
src/video_core/color.h → src/common/color.h

2
src/core/hw/gpu.cpp

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/color.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "core/arm/arm_interface.h" #include "core/arm/arm_interface.h"
@ -22,7 +23,6 @@
#include "video_core/command_processor.h" #include "video_core/command_processor.h"
#include "video_core/utils.h" #include "video_core/utils.h"
#include "video_core/video_core.h" #include "video_core/video_core.h"
#include "video_core/color.h"
namespace GPU { namespace GPU {

1
src/video_core/CMakeLists.txt

@ -29,7 +29,6 @@ set(HEADERS
renderer_opengl/pica_to_gl.h renderer_opengl/pica_to_gl.h
renderer_opengl/renderer_opengl.h renderer_opengl/renderer_opengl.h
clipper.h clipper.h
color.h
command_processor.h command_processor.h
gpu_debugger.h gpu_debugger.h
hwrasterizer_base.h hwrasterizer_base.h

2
src/video_core/debug_utils/debug_utils.cpp

@ -17,11 +17,11 @@
#include <nihstro/shader_binary.h> #include <nihstro/shader_binary.h>
#include "common/assert.h" #include "common/assert.h"
#include "common/color.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/math_util.h" #include "common/math_util.h"
#include "common/vector_math.h" #include "common/vector_math.h"
#include "video_core/color.h"
#include "video_core/pica.h" #include "video_core/pica.h"
#include "video_core/utils.h" #include "video_core/utils.h"
#include "video_core/video_core.h" #include "video_core/video_core.h"

2
src/video_core/rasterizer.cpp

@ -4,6 +4,7 @@
#include <algorithm> #include <algorithm>
#include "common/color.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/math_util.h" #include "common/math_util.h"
#include "common/profiler.h" #include "common/profiler.h"
@ -13,7 +14,6 @@
#include "debug_utils/debug_utils.h" #include "debug_utils/debug_utils.h"
#include "math.h" #include "math.h"
#include "color.h"
#include "pica.h" #include "pica.h"
#include "rasterizer.h" #include "rasterizer.h"
#include "vertex_shader.h" #include "vertex_shader.h"

3
src/video_core/renderer_opengl/gl_rasterizer.cpp

@ -2,10 +2,11 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/color.h"
#include "core/settings.h" #include "core/settings.h"
#include "core/hw/gpu.h" #include "core/hw/gpu.h"
#include "video_core/color.h"
#include "video_core/pica.h" #include "video_core/pica.h"
#include "video_core/utils.h" #include "video_core/utils.h"
#include "video_core/renderer_opengl/gl_rasterizer.h" #include "video_core/renderer_opengl/gl_rasterizer.h"

Loading…
Cancel
Save