summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar zawata2015-06-27 19:35:13 -0700
committerGravatar zawata2015-07-19 03:59:50 -0700
commit017437e8d77048d40a1e764cc4c2b2c211233e47 (patch)
treef0b32c376d3bf37594e3fca3549e6359b008cd19 /src
parentVideo_Core : Fix Conversion Warnings (diff)
downloadyuzu-017437e8d77048d40a1e764cc4c2b2c211233e47.tar.gz
yuzu-017437e8d77048d40a1e764cc4c2b2c211233e47.tar.xz
yuzu-017437e8d77048d40a1e764cc4c2b2c211233e47.zip
Video_Core : Change Tabs to Spaces
This really should be universalized, I keep getting errors creating commits because lines I've edited use tabs instead of spaces(and yes I did read the contributing guide and i know they are supposed to be spaces)
Diffstat (limited to 'src')
-rw-r--r--src/video_core/debug_utils/debug_utils.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index b492b24ad..8f732242e 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -85,6 +85,7 @@ void GeometryDumper::AddTriangle(Vertex& v0, Vertex& v1, Vertex& v2) {
85 vertices.push_back(v1); 85 vertices.push_back(v1);
86 vertices.push_back(v2); 86 vertices.push_back(v2);
87 87
88 int num_vertices = static_cast<int>(vertices.size());
88 faces.push_back({ num_vertices-3, num_vertices-2, num_vertices-1 }); 89 faces.push_back({ num_vertices-3, num_vertices-2, num_vertices-1 });
89} 90}
90 91
@@ -240,6 +241,8 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data
240 241
241 dvle.main_offset_words = main_offset; 242 dvle.main_offset_words = main_offset;
242 dvle.output_register_table_offset = write_offset - dvlb.dvle_offset; 243 dvle.output_register_table_offset = write_offset - dvlb.dvle_offset;
244 dvle.output_register_table_size = static_cast<uint32_t>(output_info_table.size());
245 QueueForWriting((u8*)output_info_table.data(), static_cast<u32>(output_info_table.size() * sizeof(OutputRegisterInfo)));
243 246
244 // TODO: Create a label table for "main" 247 // TODO: Create a label table for "main"
245 248
@@ -495,18 +498,30 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture
495 Math::Vec3<int> ret; 498 Math::Vec3<int> ret;
496 if (differential_mode) { 499 if (differential_mode) {
497 ret.r() = static_cast<int>(differential.r); 500 ret.r() = static_cast<int>(differential.r);
501 ret.g() = static_cast<int>(differential.g);
502 ret.b() = static_cast<int>(differential.b);
498 if (x >= 2) { 503 if (x >= 2) {
504 ret.r() += static_cast<int>(differential.dr);
505 ret.g() += static_cast<int>(differential.dg);
506 ret.b() += static_cast<int>(differential.db);
499 } 507 }
500 ret.r() = Color::Convert5To8(ret.r()); 508 ret.r() = Color::Convert5To8(ret.r());
501 ret.g() = Color::Convert5To8(ret.g()); 509 ret.g() = Color::Convert5To8(ret.g());
502 ret.b() = Color::Convert5To8(ret.b()); 510 ret.b() = Color::Convert5To8(ret.b());
503 } else { 511 } else {
504 if (x < 2) { 512 if (x < 2) {
513 ret.r() = Color::Convert4To8(static_cast<u8>(separate.r1));
514 ret.g() = Color::Convert4To8(static_cast<u8>(separate.g1));
515 ret.b() = Color::Convert4To8(static_cast<u8>(separate.b1));
505 } else { 516 } else {
517 ret.r() = Color::Convert4To8(static_cast<u8>(separate.r2));
518 ret.g() = Color::Convert4To8(static_cast<u8>(separate.g2));
519 ret.b() = Color::Convert4To8(static_cast<u8>(separate.b2));
506 } 520 }
507 } 521 }
508 522
509 // Add modifier 523 // Add modifier
524 unsigned table_index = static_cast<int>((x < 2) ? table_index_1.Value() : table_index_2.Value());
510 525
511 static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{ 526 static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{
512 { 2, 8 }, { 5, 17 }, { 9, 29 }, { 13, 42 }, 527 { 2, 8 }, { 5, 17 }, { 9, 29 }, { 13, 42 },