diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-14 14:09:32 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-04-14 16:01:40 -0400 |
| commit | 0d408b965b971c2b8df9a6e4c1cd1d7a8e9dc5d1 (patch) | |
| tree | f01ec2e57dfab81e8071dccb409727ff7a17a5b2 /src/video_core/renderer_opengl | |
| parent | 86135864da9bbbd5906e96862994bd24f3cd4da5 (diff) | |
shaders: Fix GCC and clang build issues.
Diffstat (limited to 'src/video_core/renderer_opengl')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_resource_manager.h | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_resource_manager.h b/src/video_core/renderer_opengl/gl_resource_manager.h index 557f73a51..2f0e7ac1a 100644 --- a/src/video_core/renderer_opengl/gl_resource_manager.h +++ b/src/video_core/renderer_opengl/gl_resource_manager.h @@ -131,7 +131,7 @@ public: } template <typename... T> - void Create(bool separable_program = false, T... shaders) { + void Create(bool separable_program, T... shaders) { if (handle != 0) return; handle = GLShader::LoadProgram(separable_program, shaders...); diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 792b4b12e..96d50dd9e 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -236,7 +236,7 @@ private: switch (OpCode::GetInfo(instr.opcode).type) { case OpCode::Type::Arithmetic: { - ASSERT(!instr.alu.abs_d, "unimplemented"); + ASSERT(!instr.alu.abs_d); std::string dest = GetRegister(instr.gpr0); std::string op_a = instr.alu.negate_a ? "-" : ""; |
