diff options
| author | bunnei <bunneidev@gmail.com> | 2016-04-25 09:08:25 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-04-25 09:08:25 -0400 |
| commit | 28de7f584e25269a4914a6d11b000f7e817cc1b4 (patch) | |
| tree | e691188c0807876d339546e14e41cb916ed24c0e /src/video_core/shader | |
| parent | 0964a3ff530f2eb5b7ecdf9dfbb74deea890352d (diff) | |
| parent | 599dc2bbb5e7325b9baa8d55ef17915dd283173d (diff) | |
Merge pull request #1714 from smspillaz/fix-1711
Fixes for #1711 and other compilation errors.
Diffstat (limited to 'src/video_core/shader')
| -rw-r--r-- | src/video_core/shader/shader_jit_x64.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp index b47d3beda..b7747fa42 100644 --- a/src/video_core/shader/shader_jit_x64.cpp +++ b/src/video_core/shader/shader_jit_x64.cpp @@ -148,7 +148,7 @@ static Instruction GetVertexShaderInstruction(size_t offset) { } static void LogCritical(const char* msg) { - LOG_CRITICAL(HW_GPU, msg); + LOG_CRITICAL(HW_GPU, "%s", msg); } void JitShader::Compile_Assert(bool condition, const char* msg) { @@ -795,6 +795,8 @@ void JitShader::FindReturnOffsets() { case OpCode::Id::CALLU: return_offsets.push_back(instr.flow_control.dest_offset + instr.flow_control.num_instructions); break; + default: + break; } } @@ -854,7 +856,7 @@ void JitShader::Compile() { uintptr_t size = reinterpret_cast<uintptr_t>(GetCodePtr()) - reinterpret_cast<uintptr_t>(program); ASSERT_MSG(size <= MAX_SHADER_SIZE, "Compiled a shader that exceeds the allocated size!"); - LOG_DEBUG(HW_GPU, "Compiled shader size=%d", size); + LOG_DEBUG(HW_GPU, "Compiled shader size=%lu", size); } JitShader::JitShader() { |