summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar James Rowe2018-07-02 10:20:50 -0600
committerGravatar bunnei2018-07-02 21:45:47 -0400
commit0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b (patch)
treeaba03bf491181cf741420dd1445bd5399e48a3af /src/video_core
parentRename logging macro back to LOG_* (diff)
downloadyuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.gz
yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.xz
yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.zip
Update clang format
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/command_processor.cpp6
-rw-r--r--src/video_core/engines/fermi_2d.cpp2
-rw-r--r--src/video_core/engines/maxwell_3d.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp10
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp12
-rw-r--r--src/video_core/renderer_opengl/maxwell_to_gl.h5
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp2
7 files changed, 20 insertions, 21 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp
index 98b33c201..31ea3adad 100644
--- a/src/video_core/command_processor.cpp
+++ b/src/video_core/command_processor.cpp
@@ -30,9 +30,9 @@ enum class BufferMethods {
30 30
31void GPU::WriteReg(u32 method, u32 subchannel, u32 value, u32 remaining_params) { 31void GPU::WriteReg(u32 method, u32 subchannel, u32 value, u32 remaining_params) {
32 LOG_WARNING(HW_GPU, 32 LOG_WARNING(HW_GPU,
33 "Processing method {:08X} on subchannel {} value " 33 "Processing method {:08X} on subchannel {} value "
34 "{:08X} remaining params {}", 34 "{:08X} remaining params {}",
35 method, subchannel, value, remaining_params); 35 method, subchannel, value, remaining_params);
36 36
37 if (method == static_cast<u32>(BufferMethods::BindObject)) { 37 if (method == static_cast<u32>(BufferMethods::BindObject)) {
38 // Bind the current subchannel to the desired engine id. 38 // Bind the current subchannel to the desired engine id.
diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp
index f9cbab8e2..34053e393 100644
--- a/src/video_core/engines/fermi_2d.cpp
+++ b/src/video_core/engines/fermi_2d.cpp
@@ -27,7 +27,7 @@ void Fermi2D::WriteReg(u32 method, u32 value) {
27 27
28void Fermi2D::HandleSurfaceCopy() { 28void Fermi2D::HandleSurfaceCopy() {
29 LOG_WARNING(HW_GPU, "Requested a surface copy with operation {}", 29 LOG_WARNING(HW_GPU, "Requested a surface copy with operation {}",
30 static_cast<u32>(regs.operation)); 30 static_cast<u32>(regs.operation));
31 31
32 const GPUVAddr source = regs.src.Address(); 32 const GPUVAddr source = regs.src.Address();
33 const GPUVAddr dest = regs.dst.Address(); 33 const GPUVAddr dest = regs.dst.Address();
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index bbd34f060..9b209a49e 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -207,8 +207,8 @@ void Maxwell3D::ProcessQueryGet() {
207} 207}
208 208
209void Maxwell3D::DrawArrays() { 209void Maxwell3D::DrawArrays() {
210 LOG_DEBUG(HW_GPU, "called, topology={}, count={}", 210 LOG_DEBUG(HW_GPU, "called, topology={}, count={}", static_cast<u32>(regs.draw.topology.Value()),
211 static_cast<u32>(regs.draw.topology.Value()), regs.vertex_buffer.count); 211 regs.vertex_buffer.count);
212 ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?"); 212 ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?");
213 213
214 auto debug_context = Core::System::GetInstance().GetGPUDebugContext(); 214 auto debug_context = Core::System::GetInstance().GetGPUDebugContext();
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 99282dac3..7c71f890b 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -166,8 +166,8 @@ std::pair<u8*, GLintptr> RasterizerOpenGL::SetupVertexArrays(u8* array_ptr,
166 for (unsigned index = 0; index < 16; ++index) { 166 for (unsigned index = 0; index < 16; ++index) {
167 auto& attrib = regs.vertex_attrib_format[index]; 167 auto& attrib = regs.vertex_attrib_format[index];
168 LOG_DEBUG(HW_GPU, "vertex attrib {}, count={}, size={}, type={}, offset={}, normalize={}", 168 LOG_DEBUG(HW_GPU, "vertex attrib {}, count={}, size={}, type={}, offset={}, normalize={}",
169 index, attrib.ComponentCount(), attrib.SizeString(), attrib.TypeString(), 169 index, attrib.ComponentCount(), attrib.SizeString(), attrib.TypeString(),
170 attrib.offset.Value(), attrib.IsNormalized()); 170 attrib.offset.Value(), attrib.IsNormalized());
171 171
172 auto& buffer = regs.vertex_array[attrib.buffer]; 172 auto& buffer = regs.vertex_array[attrib.buffer];
173 ASSERT(buffer.IsEnabled()); 173 ASSERT(buffer.IsEnabled());
@@ -251,8 +251,8 @@ void RasterizerOpenGL::SetupShaders(u8* buffer_ptr, GLintptr buffer_offset) {
251 break; 251 break;
252 } 252 }
253 default: 253 default:
254 LOG_CRITICAL(HW_GPU, "Unimplemented shader index={}, enable={}, offset=0x{:08X}", 254 LOG_CRITICAL(HW_GPU, "Unimplemented shader index={}, enable={}, offset=0x{:08X}", index,
255 index, shader_config.enable.Value(), shader_config.offset); 255 shader_config.enable.Value(), shader_config.offset);
256 UNREACHABLE(); 256 UNREACHABLE();
257 } 257 }
258 258
@@ -588,7 +588,7 @@ u32 RasterizerOpenGL::SetupConstBuffers(Maxwell::ShaderStage stage, GLuint progr
588 588
589 if (size > MaxConstbufferSize) { 589 if (size > MaxConstbufferSize) {
590 LOG_ERROR(HW_GPU, "indirect constbuffer size {} exceeds maximum {}", size, 590 LOG_ERROR(HW_GPU, "indirect constbuffer size {} exceeds maximum {}", size,
591 MaxConstbufferSize); 591 MaxConstbufferSize);
592 size = MaxConstbufferSize; 592 size = MaxConstbufferSize;
593 } 593 }
594 } else { 594 } else {
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 2e801cdf6..2901280a1 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -919,7 +919,7 @@ private:
919 break; 919 break;
920 default: 920 default:
921 LOG_CRITICAL(HW_GPU, "Unhandled MUFU sub op: {0:x}", 921 LOG_CRITICAL(HW_GPU, "Unhandled MUFU sub op: {0:x}",
922 static_cast<unsigned>(instr.sub_op.Value())); 922 static_cast<unsigned>(instr.sub_op.Value()));
923 UNREACHABLE(); 923 UNREACHABLE();
924 } 924 }
925 break; 925 break;
@@ -1059,7 +1059,7 @@ private:
1059 } 1059 }
1060 default: { 1060 default: {
1061 LOG_CRITICAL(HW_GPU, "Unhandled ArithmeticIntegerImmediate instruction: {}", 1061 LOG_CRITICAL(HW_GPU, "Unhandled ArithmeticIntegerImmediate instruction: {}",
1062 opcode->GetName()); 1062 opcode->GetName());
1063 UNREACHABLE(); 1063 UNREACHABLE();
1064 } 1064 }
1065 } 1065 }
@@ -1125,7 +1125,7 @@ private:
1125 } 1125 }
1126 default: { 1126 default: {
1127 LOG_CRITICAL(HW_GPU, "Unhandled ArithmeticInteger instruction: {}", 1127 LOG_CRITICAL(HW_GPU, "Unhandled ArithmeticInteger instruction: {}",
1128 opcode->GetName()); 1128 opcode->GetName());
1129 UNREACHABLE(); 1129 UNREACHABLE();
1130 } 1130 }
1131 } 1131 }
@@ -1220,7 +1220,7 @@ private:
1220 break; 1220 break;
1221 default: 1221 default:
1222 LOG_CRITICAL(HW_GPU, "Unimplemented f2f rounding mode {}", 1222 LOG_CRITICAL(HW_GPU, "Unimplemented f2f rounding mode {}",
1223 static_cast<u32>(instr.conversion.f2f.rounding.Value())); 1223 static_cast<u32>(instr.conversion.f2f.rounding.Value()));
1224 UNREACHABLE(); 1224 UNREACHABLE();
1225 break; 1225 break;
1226 } 1226 }
@@ -1254,7 +1254,7 @@ private:
1254 break; 1254 break;
1255 default: 1255 default:
1256 LOG_CRITICAL(HW_GPU, "Unimplemented f2i rounding mode {}", 1256 LOG_CRITICAL(HW_GPU, "Unimplemented f2i rounding mode {}",
1257 static_cast<u32>(instr.conversion.f2i.rounding.Value())); 1257 static_cast<u32>(instr.conversion.f2i.rounding.Value()));
1258 UNREACHABLE(); 1258 UNREACHABLE();
1259 break; 1259 break;
1260 } 1260 }
@@ -1306,7 +1306,7 @@ private:
1306 1306
1307 default: 1307 default:
1308 LOG_CRITICAL(HW_GPU, "Unhandled type: {}", 1308 LOG_CRITICAL(HW_GPU, "Unhandled type: {}",
1309 static_cast<unsigned>(instr.ld_c.type.Value())); 1309 static_cast<unsigned>(instr.ld_c.type.Value()));
1310 UNREACHABLE(); 1310 UNREACHABLE();
1311 } 1311 }
1312 break; 1312 break;
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h
index 1913397e4..6b9bb3df1 100644
--- a/src/video_core/renderer_opengl/maxwell_to_gl.h
+++ b/src/video_core/renderer_opengl/maxwell_to_gl.h
@@ -91,7 +91,7 @@ inline GLenum TextureFilterMode(Tegra::Texture::TextureFilter filter_mode) {
91 return GL_NEAREST; 91 return GL_NEAREST;
92 } 92 }
93 LOG_CRITICAL(Render_OpenGL, "Unimplemented texture filter mode={}", 93 LOG_CRITICAL(Render_OpenGL, "Unimplemented texture filter mode={}",
94 static_cast<u32>(filter_mode)); 94 static_cast<u32>(filter_mode));
95 UNREACHABLE(); 95 UNREACHABLE();
96 return {}; 96 return {};
97} 97}
@@ -110,8 +110,7 @@ inline GLenum WrapMode(Tegra::Texture::WrapMode wrap_mode) {
110 // manually mix them. However the shader part of this is not yet implemented. 110 // manually mix them. However the shader part of this is not yet implemented.
111 return GL_CLAMP_TO_BORDER; 111 return GL_CLAMP_TO_BORDER;
112 } 112 }
113 LOG_CRITICAL(Render_OpenGL, "Unimplemented texture wrap mode={}", 113 LOG_CRITICAL(Render_OpenGL, "Unimplemented texture wrap mode={}", static_cast<u32>(wrap_mode));
114 static_cast<u32>(wrap_mode));
115 UNREACHABLE(); 114 UNREACHABLE();
116 return {}; 115 return {};
117} 116}
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index af5b480a3..00841e937 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -302,7 +302,7 @@ void RendererOpenGL::DrawScreenTriangles(const ScreenInfo& screen_info, float x,
302 } else { 302 } else {
303 // Other transformations are unsupported 303 // Other transformations are unsupported
304 LOG_CRITICAL(Render_OpenGL, "Unsupported framebuffer_transform_flags={}", 304 LOG_CRITICAL(Render_OpenGL, "Unsupported framebuffer_transform_flags={}",
305 static_cast<u32>(framebuffer_transform_flags)); 305 static_cast<u32>(framebuffer_transform_flags));
306 UNIMPLEMENTED(); 306 UNIMPLEMENTED();
307 } 307 }
308 } 308 }