summaryrefslogtreecommitdiff
path: root/src/video_core/shader
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-02-12 12:33:26 -0800
committerGravatar GitHub2017-02-12 12:33:26 -0800
commit443bb3d522916f9be2d27fc8b3d7b5cc942213df (patch)
tree5a83052ad2f5888a282d4db2ef9b9f2d4e647a60 /src/video_core/shader
parentcitra-qt: Don't attempt to scan files with unsupported extensions (#2402) (diff)
parentVideoCore: Split u64 Pica reg unions into 2 separate u32 unions (diff)
downloadyuzu-443bb3d522916f9be2d27fc8b3d7b5cc942213df.tar.gz
yuzu-443bb3d522916f9be2d27fc8b3d7b5cc942213df.tar.xz
yuzu-443bb3d522916f9be2d27fc8b3d7b5cc942213df.zip
Merge pull request #2550 from yuriks/pica-refactor2
Small VideoCore cleanups
Diffstat (limited to 'src/video_core/shader')
-rw-r--r--src/video_core/shader/shader.cpp3
-rw-r--r--src/video_core/shader/shader.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index 60c5b9ad5..67ed19ba8 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -8,7 +8,8 @@
8#include "common/logging/log.h" 8#include "common/logging/log.h"
9#include "common/microprofile.h" 9#include "common/microprofile.h"
10#include "video_core/pica_state.h" 10#include "video_core/pica_state.h"
11#include "video_core/regs.h" 11#include "video_core/regs_rasterizer.h"
12#include "video_core/regs_shader.h"
12#include "video_core/shader/shader.h" 13#include "video_core/shader/shader.h"
13#include "video_core/shader/shader_interpreter.h" 14#include "video_core/shader/shader_interpreter.h"
14#ifdef ARCHITECTURE_x86_64 15#ifdef ARCHITECTURE_x86_64
diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h
index d52682479..38ea717ab 100644
--- a/src/video_core/shader/shader.h
+++ b/src/video_core/shader/shader.h
@@ -13,7 +13,8 @@
13#include "common/common_types.h" 13#include "common/common_types.h"
14#include "common/vector_math.h" 14#include "common/vector_math.h"
15#include "video_core/pica_types.h" 15#include "video_core/pica_types.h"
16#include "video_core/regs.h" 16#include "video_core/regs_rasterizer.h"
17#include "video_core/regs_shader.h"
17 18
18using nihstro::RegisterType; 19using nihstro::RegisterType;
19using nihstro::SourceRegister; 20using nihstro::SourceRegister;