shaders: Fix GCC and clang build issues.

merge-requests/60/head
bunnei 2018-04-14 14:09:32 +07:00
parent 86135864da
commit 0d408b965b
3 changed files with 5 additions and 5 deletions

@ -12,7 +12,7 @@ namespace Tegra {
namespace Shader { namespace Shader {
struct Register { struct Register {
constexpr Register() = default; Register() = default;
constexpr Register(u64 value) : value(value) {} constexpr Register(u64 value) : value(value) {}
@ -47,7 +47,7 @@ private:
}; };
union Attribute { union Attribute {
constexpr Attribute() = default; Attribute() = default;
constexpr Attribute(u64 value) : value(value) {} constexpr Attribute(u64 value) : value(value) {}
@ -118,7 +118,7 @@ union OpCode {
std::string name; std::string name;
}; };
constexpr OpCode() = default; OpCode() = default;
constexpr OpCode(Id value) : value(static_cast<u64>(value)) {} constexpr OpCode(Id value) : value(static_cast<u64>(value)) {}

@ -131,7 +131,7 @@ public:
} }
template <typename... T> template <typename... T>
void Create(bool separable_program = false, T... shaders) { void Create(bool separable_program, T... shaders) {
if (handle != 0) if (handle != 0)
return; return;
handle = GLShader::LoadProgram(separable_program, shaders...); handle = GLShader::LoadProgram(separable_program, shaders...);

@ -236,7 +236,7 @@ private:
switch (OpCode::GetInfo(instr.opcode).type) { switch (OpCode::GetInfo(instr.opcode).type) {
case OpCode::Type::Arithmetic: { case OpCode::Type::Arithmetic: {
ASSERT(!instr.alu.abs_d, "unimplemented"); ASSERT(!instr.alu.abs_d);
std::string dest = GetRegister(instr.gpr0); std::string dest = GetRegister(instr.gpr0);
std::string op_a = instr.alu.negate_a ? "-" : ""; std::string op_a = instr.alu.negate_a ? "-" : "";