diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2018-12-21 03:18:54 -0300 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-15 17:54:52 -0300 |
| commit | 59b34b1d76371bc1bf70ca263a1ac63293a8409e (patch) | |
| tree | aa1c1bdaf6e784f21978a260fabe826081fcbbb3 | |
| parent | 57a900cc45424ace03db9f021c0b568339745bee (diff) | |
shader_ir: Fixup file inclusions and clang-format
| -rw-r--r-- | src/video_core/shader/decode.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/shader/decode/other.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/shader/shader_ir.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/shader/decode.cpp b/src/video_core/shader/decode.cpp index c973328ab..a07656c7c 100644 --- a/src/video_core/shader/decode.cpp +++ b/src/video_core/shader/decode.cpp @@ -7,6 +7,7 @@ #include <fmt/format.h> +#include "common/assert.h" #include "common/common_types.h" #include "video_core/engines/shader_bytecode.h" #include "video_core/engines/shader_header.h" diff --git a/src/video_core/shader/decode/other.cpp b/src/video_core/shader/decode/other.cpp index 9200b5da9..9630ef831 100644 --- a/src/video_core/shader/decode/other.cpp +++ b/src/video_core/shader/decode/other.cpp @@ -9,9 +9,9 @@ namespace VideoCommon::Shader { +using Tegra::Shader::ConditionCode; using Tegra::Shader::Instruction; using Tegra::Shader::OpCode; -using Tegra::Shader::ConditionCode; u32 ShaderIR::DecodeOther(BasicBlock& bb, u32 pc) { const Instruction instr = {program_code[pc]}; diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h index 8a1985526..fc41b7de3 100644 --- a/src/video_core/shader/shader_ir.h +++ b/src/video_core/shader/shader_ir.h @@ -12,7 +12,6 @@ #include <variant> #include <vector> -#include "common/assert.h" #include "common/common_types.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/engines/shader_bytecode.h" |