From 0d408b965b971c2b8df9a6e4c1cd1d7a8e9dc5d1 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 14 Apr 2018 14:09:32 -0400 Subject: shaders: Fix GCC and clang build issues. --- src/video_core/engines/shader_bytecode.h | 6 +++--- src/video_core/renderer_opengl/gl_resource_manager.h | 2 +- src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index dbcd23755..e285d097d 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -12,7 +12,7 @@ namespace Tegra { namespace Shader { struct Register { - constexpr Register() = default; + Register() = default; constexpr Register(u64 value) : value(value) {} @@ -47,7 +47,7 @@ private: }; union Attribute { - constexpr Attribute() = default; + Attribute() = default; constexpr Attribute(u64 value) : value(value) {} @@ -118,7 +118,7 @@ union OpCode { std::string name; }; - constexpr OpCode() = default; + OpCode() = default; constexpr OpCode(Id value) : value(static_cast(value)) {} 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 - 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 ? "-" : ""; -- cgit v1.2.3