summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-04-02 06:02:03 +0200
committerbunnei <bunneidev@gmail.com>2016-04-14 05:04:49 +0200
commitf3afe24594bad11d7e0fd28902d1ce1e6e22e3a2 (patch)
tree32a252926d4679f68fbae537a129a0dc92e96f58
parentshader: Remove unused 'state' argument from 'Setup' function. (diff)
downloadyuzu-f3afe24594bad11d7e0fd28902d1ce1e6e22e3a2.tar
yuzu-f3afe24594bad11d7e0fd28902d1ce1e6e22e3a2.tar.gz
yuzu-f3afe24594bad11d7e0fd28902d1ce1e6e22e3a2.tar.bz2
yuzu-f3afe24594bad11d7e0fd28902d1ce1e6e22e3a2.tar.lz
yuzu-f3afe24594bad11d7e0fd28902d1ce1e6e22e3a2.tar.xz
yuzu-f3afe24594bad11d7e0fd28902d1ce1e6e22e3a2.tar.zst
yuzu-f3afe24594bad11d7e0fd28902d1ce1e6e22e3a2.zip
-rw-r--r--src/video_core/shader/shader_jit_x64.cpp18
-rw-r--r--src/video_core/shader/shader_jit_x64.h6
2 files changed, 19 insertions, 5 deletions
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp
index cbdc1e40f..dda9bcef7 100644
--- a/src/video_core/shader/shader_jit_x64.cpp
+++ b/src/video_core/shader/shader_jit_x64.cpp
@@ -146,6 +146,16 @@ static Instruction GetVertexShaderInstruction(size_t offset) {
return { g_state.vs.program_code[offset] };
}
+static void LogCritical(const char* msg) {
+ LOG_CRITICAL(HW_GPU, msg);
+}
+
+void JitCompiler::RuntimeAssert(bool condition, const char* msg) {
+ if (!condition) {
+ ABI_CallFunctionP(reinterpret_cast<const void*>(LogCritical), const_cast<char*>(msg));
+ }
+}
+
/**
* Loads and swizzles a source register into the specified XMM register.
* @param instr VS instruction, used for determining how to load the source register
@@ -667,8 +677,7 @@ void JitCompiler::Compile_MAD(Instruction instr) {
}
void JitCompiler::Compile_IF(Instruction instr) {
- ASSERT_MSG(instr.flow_control.dest_offset > last_program_counter, "Backwards if-statements (%d -> %d) not supported",
- last_program_counter, instr.flow_control.dest_offset.Value());
+ RuntimeAssert(instr.flow_control.dest_offset > last_program_counter, "Backwards if-statements not supported");
// Evaluate the "IF" condition
if (instr.opcode.Value() == OpCode::Id::IFU) {
@@ -699,9 +708,8 @@ void JitCompiler::Compile_IF(Instruction instr) {
}
void JitCompiler::Compile_LOOP(Instruction instr) {
- ASSERT_MSG(instr.flow_control.dest_offset > last_program_counter, "Backwards loops (%d -> %d) not supported",
- last_program_counter, instr.flow_control.dest_offset.Value());
- ASSERT_MSG(!looping, "Nested loops not supported");
+ RuntimeAssert(instr.flow_control.dest_offset > last_program_counter, "Backwards loops not supported");
+ RuntimeAssert(!looping, "Nested loops not supported");
looping = true;
diff --git a/src/video_core/shader/shader_jit_x64.h b/src/video_core/shader/shader_jit_x64.h
index 1501d13bf..159b902b2 100644
--- a/src/video_core/shader/shader_jit_x64.h
+++ b/src/video_core/shader/shader_jit_x64.h
@@ -91,6 +91,12 @@ private:
BitSet32 PersistentCallerSavedRegs();
/**
+ * Assertion evaluated at compile-time, but only triggered if executed at runtime.
+ * @param msg Message to be logged if the assertion fails.
+ */
+ void RuntimeAssert(bool condition, const char* msg);
+
+ /**
* Analyzes the entire shader program for `CALL` instructions before emitting any code,
* identifying the locations where a return needs to be inserted.
*/