diff options
| author | 2016-04-12 23:35:36 -0400 | |
|---|---|---|
| committer | 2016-04-13 23:04:53 -0400 | |
| commit | d7fe2784cca9c13d1f79f4063691fc4ced1c4759 (patch) | |
| tree | 7bb6c9fd8e9a659369e92661478925512ac8eddd /src | |
| parent | shader_jit_x64.cpp: Rename JitCompiler to JitShader. (diff) | |
| download | yuzu-d7fe2784cca9c13d1f79f4063691fc4ced1c4759.tar.gz yuzu-d7fe2784cca9c13d1f79f4063691fc4ced1c4759.tar.xz yuzu-d7fe2784cca9c13d1f79f4063691fc4ced1c4759.zip | |
shader_jit_x64: Rename RuntimeAssert to Compile_Assert.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/shader/shader_jit_x64.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/shader/shader_jit_x64.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp index 9369d2fe5..b47d3beda 100644 --- a/src/video_core/shader/shader_jit_x64.cpp +++ b/src/video_core/shader/shader_jit_x64.cpp | |||
| @@ -151,7 +151,7 @@ static void LogCritical(const char* msg) { | |||
| 151 | LOG_CRITICAL(HW_GPU, msg); | 151 | LOG_CRITICAL(HW_GPU, msg); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | void JitShader::RuntimeAssert(bool condition, const char* msg) { | 154 | void JitShader::Compile_Assert(bool condition, const char* msg) { |
| 155 | if (!condition) { | 155 | if (!condition) { |
| 156 | ABI_CallFunctionP(reinterpret_cast<const void*>(LogCritical), const_cast<char*>(msg)); | 156 | ABI_CallFunctionP(reinterpret_cast<const void*>(LogCritical), const_cast<char*>(msg)); |
| 157 | } | 157 | } |
| @@ -670,7 +670,7 @@ void JitShader::Compile_MAD(Instruction instr) { | |||
| 670 | } | 670 | } |
| 671 | 671 | ||
| 672 | void JitShader::Compile_IF(Instruction instr) { | 672 | void JitShader::Compile_IF(Instruction instr) { |
| 673 | RuntimeAssert(instr.flow_control.dest_offset >= program_counter, "Backwards if-statements not supported"); | 673 | Compile_Assert(instr.flow_control.dest_offset >= program_counter, "Backwards if-statements not supported"); |
| 674 | 674 | ||
| 675 | // Evaluate the "IF" condition | 675 | // Evaluate the "IF" condition |
| 676 | if (instr.opcode.Value() == OpCode::Id::IFU) { | 676 | if (instr.opcode.Value() == OpCode::Id::IFU) { |
| @@ -701,8 +701,8 @@ void JitShader::Compile_IF(Instruction instr) { | |||
| 701 | } | 701 | } |
| 702 | 702 | ||
| 703 | void JitShader::Compile_LOOP(Instruction instr) { | 703 | void JitShader::Compile_LOOP(Instruction instr) { |
| 704 | RuntimeAssert(instr.flow_control.dest_offset >= program_counter, "Backwards loops not supported"); | 704 | Compile_Assert(instr.flow_control.dest_offset >= program_counter, "Backwards loops not supported"); |
| 705 | RuntimeAssert(!looping, "Nested loops not supported"); | 705 | Compile_Assert(!looping, "Nested loops not supported"); |
| 706 | 706 | ||
| 707 | looping = true; | 707 | looping = true; |
| 708 | 708 | ||
diff --git a/src/video_core/shader/shader_jit_x64.h b/src/video_core/shader/shader_jit_x64.h index 005fbdbe3..cd6280ade 100644 --- a/src/video_core/shader/shader_jit_x64.h +++ b/src/video_core/shader/shader_jit_x64.h | |||
| @@ -94,7 +94,7 @@ private: | |||
| 94 | * Assertion evaluated at compile-time, but only triggered if executed at runtime. | 94 | * Assertion evaluated at compile-time, but only triggered if executed at runtime. |
| 95 | * @param msg Message to be logged if the assertion fails. | 95 | * @param msg Message to be logged if the assertion fails. |
| 96 | */ | 96 | */ |
| 97 | void RuntimeAssert(bool condition, const char* msg); | 97 | void Compile_Assert(bool condition, const char* msg); |
| 98 | 98 | ||
| 99 | /** | 99 | /** |
| 100 | * Analyzes the entire shader program for `CALL` instructions before emitting any code, | 100 | * Analyzes the entire shader program for `CALL` instructions before emitting any code, |