franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1503 from ReinUsesLisp/misc-vc

Browse Source 
video_core: Minor style changes
This commit is contained in:
bunnei 2018-10-15 16:38:20 -04:00 committed by GitHub
commit 123df8f7d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/engines/shader_bytecode.h
View File

@ -267,7 +267,7 @@ enum class ControlCode : u64 {
GTU = 12, GTU = 12,
NEU = 13, NEU = 13,
GEU = 14, GEU = 14,
// T = 15,
OFF = 16, OFF = 16,
LO = 17, LO = 17,
SFF = 18, SFF = 18,

3
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -286,7 +286,8 @@ void RasterizerOpenGL::SetupShaders(GLenum primitive_mode) {
&ubo, sizeof(ubo), static_cast<std::size_t>(uniform_buffer_alignment)); &ubo, sizeof(ubo), static_cast<std::size_t>(uniform_buffer_alignment));
// Bind the buffer // Bind the buffer
glBindBufferRange(GL_UNIFORM_BUFFER, stage, buffer_cache.GetHandle(), offset, sizeof(ubo)); glBindBufferRange(GL_UNIFORM_BUFFER, static_cast<GLuint>(stage), buffer_cache.GetHandle(),
offset, static_cast<GLsizeiptr>(sizeof(ubo)));
Shader shader{shader_cache.GetStageProgram(program)}; Shader shader{shader_cache.GetStageProgram(program)};

8
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View File

@ -1436,7 +1436,6 @@ private:
break; break;
} }
case OpCode::Type::Shift: { case OpCode::Type::Shift: {
std::string op_a = regs.GetRegisterAsInteger(instr.gpr8, 0, true); std::string op_a = regs.GetRegisterAsInteger(instr.gpr8, 0, true);
std::string op_b; std::string op_b;
@ -1478,7 +1477,6 @@ private:
} }
break; break;
} }
case OpCode::Type::ArithmeticIntegerImmediate: { case OpCode::Type::ArithmeticIntegerImmediate: {
std::string op_a = regs.GetRegisterAsInteger(instr.gpr8); std::string op_a = regs.GetRegisterAsInteger(instr.gpr8);
std::string op_b = std::to_string(instr.alu.imm20_32.Value()); std::string op_b = std::to_string(instr.alu.imm20_32.Value());
@ -2626,14 +2624,14 @@ private:
const std::string pred = const std::string pred =
GetPredicateCondition(instr.csetp.pred39, instr.csetp.neg_pred39 != 0); GetPredicateCondition(instr.csetp.pred39, instr.csetp.neg_pred39 != 0);
const std::string combiner = GetPredicateCombiner(instr.csetp.op); const std::string combiner = GetPredicateCombiner(instr.csetp.op);
const std::string controlCode = regs.GetControlCode(instr.csetp.cc); const std::string control_code = regs.GetControlCode(instr.csetp.cc);
if (instr.csetp.pred3 != static_cast<u64>(Pred::UnusedIndex)) { if (instr.csetp.pred3 != static_cast<u64>(Pred::UnusedIndex)) {
SetPredicate(instr.csetp.pred3, SetPredicate(instr.csetp.pred3,
'(' + controlCode + ") " + combiner + " (" + pred + ')'); '(' + control_code + ") " + combiner + " (" + pred + ')');
} }
if (instr.csetp.pred0 != static_cast<u64>(Pred::UnusedIndex)) { if (instr.csetp.pred0 != static_cast<u64>(Pred::UnusedIndex)) {
SetPredicate(instr.csetp.pred0, SetPredicate(instr.csetp.pred0,
"!(" + controlCode + ") " + combiner + " (" + pred + ')'); "!(" + control_code + ") " + combiner + " (" + pred + ')');
} }
break; break;
} }