summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/citra_qt/main.cpp5
-rw-r--r--src/core/file_sys/archive_backend.h7
-rw-r--r--src/core/file_sys/disk_archive.cpp4
-rw-r--r--src/core/file_sys/disk_archive.h1
-rw-r--r--src/core/file_sys/ivfc_archive.cpp6
-rw-r--r--src/core/file_sys/ivfc_archive.h1
-rw-r--r--src/core/hle/service/fs/archive.cpp12
-rw-r--r--src/core/hle/service/fs/archive.h9
-rw-r--r--src/core/hle/service/fs/fs_user.cpp75
-rw-r--r--src/core/hw/gpu.cpp573
-rw-r--r--src/core/memory.cpp3
-rw-r--r--src/video_core/rasterizer_interface.h7
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp52
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h4
-rw-r--r--src/video_core/renderer_opengl/gl_shader_gen.cpp9
15 files changed, 468 insertions, 300 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 929392b14..8322e2305 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -295,7 +295,6 @@ bool GMainWindow::LoadROM(const std::string& filename) {
295 Loader::ResultStatus result = app_loader->Load(); 295 Loader::ResultStatus result = app_loader->Load();
296 if (Loader::ResultStatus::Success != result) { 296 if (Loader::ResultStatus::Success != result) {
297 LOG_CRITICAL(Frontend, "Failed to load ROM!"); 297 LOG_CRITICAL(Frontend, "Failed to load ROM!");
298 System::Shutdown();
299 298
300 switch (result) { 299 switch (result) {
301 case Loader::ResultStatus::ErrorEncrypted: { 300 case Loader::ResultStatus::ErrorEncrypted: {
@@ -335,8 +334,10 @@ void GMainWindow::BootGame(const std::string& filename) {
335 if (!InitializeSystem()) 334 if (!InitializeSystem())
336 return; 335 return;
337 336
338 if (!LoadROM(filename)) 337 if (!LoadROM(filename)) {
338 System::Shutdown();
339 return; 339 return;
340 }
340 341
341 // Create and start the emulation thread 342 // Create and start the emulation thread
342 emu_thread = std::make_unique<EmuThread>(render_window); 343 emu_thread = std::make_unique<EmuThread>(render_window);
diff --git a/src/core/file_sys/archive_backend.h b/src/core/file_sys/archive_backend.h
index d69c3c785..06b8f2ed7 100644
--- a/src/core/file_sys/archive_backend.h
+++ b/src/core/file_sys/archive_backend.h
@@ -112,6 +112,13 @@ public:
112 virtual bool DeleteDirectory(const Path& path) const = 0; 112 virtual bool DeleteDirectory(const Path& path) const = 0;
113 113
114 /** 114 /**
115 * Delete a directory specified by its path and anything under it
116 * @param path Path relative to the archive
117 * @return Whether the directory could be deleted
118 */
119 virtual bool DeleteDirectoryRecursively(const Path& path) const = 0;
120
121 /**
115 * Create a file specified by its path 122 * Create a file specified by its path
116 * @param path Path relative to the Archive 123 * @param path Path relative to the Archive
117 * @param size The size of the new file, filled with zeroes 124 * @param size The size of the new file, filled with zeroes
diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp
index 0f66998e1..2f05af361 100644
--- a/src/core/file_sys/disk_archive.cpp
+++ b/src/core/file_sys/disk_archive.cpp
@@ -51,6 +51,10 @@ bool DiskArchive::DeleteDirectory(const Path& path) const {
51 return FileUtil::DeleteDir(mount_point + path.AsString()); 51 return FileUtil::DeleteDir(mount_point + path.AsString());
52} 52}
53 53
54bool DiskArchive::DeleteDirectoryRecursively(const Path& path) const {
55 return FileUtil::DeleteDirRecursively(mount_point + path.AsString());
56}
57
54ResultCode DiskArchive::CreateFile(const FileSys::Path& path, u64 size) const { 58ResultCode DiskArchive::CreateFile(const FileSys::Path& path, u64 size) const {
55 std::string full_path = mount_point + path.AsString(); 59 std::string full_path = mount_point + path.AsString();
56 60
diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index 2165f27f9..59ebb2002 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -38,6 +38,7 @@ public:
38 ResultCode DeleteFile(const Path& path) const override; 38 ResultCode DeleteFile(const Path& path) const override;
39 bool RenameFile(const Path& src_path, const Path& dest_path) const override; 39 bool RenameFile(const Path& src_path, const Path& dest_path) const override;
40 bool DeleteDirectory(const Path& path) const override; 40 bool DeleteDirectory(const Path& path) const override;
41 bool DeleteDirectoryRecursively(const Path& path) const override;
41 ResultCode CreateFile(const Path& path, u64 size) const override; 42 ResultCode CreateFile(const Path& path, u64 size) const override;
42 bool CreateDirectory(const Path& path) const override; 43 bool CreateDirectory(const Path& path) const override;
43 bool RenameDirectory(const Path& src_path, const Path& dest_path) const override; 44 bool RenameDirectory(const Path& src_path, const Path& dest_path) const override;
diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp
index 49cc1de10..af59d296d 100644
--- a/src/core/file_sys/ivfc_archive.cpp
+++ b/src/core/file_sys/ivfc_archive.cpp
@@ -43,6 +43,12 @@ bool IVFCArchive::DeleteDirectory(const Path& path) const {
43 return false; 43 return false;
44} 44}
45 45
46bool IVFCArchive::DeleteDirectoryRecursively(const Path& path) const {
47 LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an IVFC archive (%s).",
48 GetName().c_str());
49 return false;
50}
51
46ResultCode IVFCArchive::CreateFile(const Path& path, u64 size) const { 52ResultCode IVFCArchive::CreateFile(const Path& path, u64 size) const {
47 LOG_CRITICAL(Service_FS, "Attempted to create a file in an IVFC archive (%s).", 53 LOG_CRITICAL(Service_FS, "Attempted to create a file in an IVFC archive (%s).",
48 GetName().c_str()); 54 GetName().c_str());
diff --git a/src/core/file_sys/ivfc_archive.h b/src/core/file_sys/ivfc_archive.h
index 0df6cf83a..2fbb3a568 100644
--- a/src/core/file_sys/ivfc_archive.h
+++ b/src/core/file_sys/ivfc_archive.h
@@ -37,6 +37,7 @@ public:
37 ResultCode DeleteFile(const Path& path) const override; 37 ResultCode DeleteFile(const Path& path) const override;
38 bool RenameFile(const Path& src_path, const Path& dest_path) const override; 38 bool RenameFile(const Path& src_path, const Path& dest_path) const override;
39 bool DeleteDirectory(const Path& path) const override; 39 bool DeleteDirectory(const Path& path) const override;
40 bool DeleteDirectoryRecursively(const Path& path) const override;
40 ResultCode CreateFile(const Path& path, u64 size) const override; 41 ResultCode CreateFile(const Path& path, u64 size) const override;
41 bool CreateDirectory(const Path& path) const override; 42 bool CreateDirectory(const Path& path) const override;
42 bool RenameDirectory(const Path& src_path, const Path& dest_path) const override; 43 bool RenameDirectory(const Path& src_path, const Path& dest_path) const override;
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index 4dc7e1e3c..7f9696bfb 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -362,6 +362,18 @@ ResultCode DeleteDirectoryFromArchive(ArchiveHandle archive_handle, const FileSy
362 ErrorSummary::Canceled, ErrorLevel::Status); 362 ErrorSummary::Canceled, ErrorLevel::Status);
363} 363}
364 364
365ResultCode DeleteDirectoryRecursivelyFromArchive(ArchiveHandle archive_handle,
366 const FileSys::Path& path) {
367 ArchiveBackend* archive = GetArchive(archive_handle);
368 if (archive == nullptr)
369 return ERR_INVALID_ARCHIVE_HANDLE;
370
371 if (archive->DeleteDirectoryRecursively(path))
372 return RESULT_SUCCESS;
373 return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
374 ErrorSummary::Canceled, ErrorLevel::Status);
375}
376
365ResultCode CreateFileInArchive(ArchiveHandle archive_handle, const FileSys::Path& path, 377ResultCode CreateFileInArchive(ArchiveHandle archive_handle, const FileSys::Path& path,
366 u64 file_size) { 378 u64 file_size) {
367 ArchiveBackend* archive = GetArchive(archive_handle); 379 ArchiveBackend* archive = GetArchive(archive_handle);
diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h
index 533be34a4..41a76285c 100644
--- a/src/core/hle/service/fs/archive.h
+++ b/src/core/hle/service/fs/archive.h
@@ -133,6 +133,15 @@ ResultCode RenameFileBetweenArchives(ArchiveHandle src_archive_handle,
133ResultCode DeleteDirectoryFromArchive(ArchiveHandle archive_handle, const FileSys::Path& path); 133ResultCode DeleteDirectoryFromArchive(ArchiveHandle archive_handle, const FileSys::Path& path);
134 134
135/** 135/**
136 * Delete a Directory and anything under it from an Archive
137 * @param archive_handle Handle to an open Archive object
138 * @param path Path to the Directory inside of the Archive
139 * @return Whether deletion succeeded
140 */
141ResultCode DeleteDirectoryRecursivelyFromArchive(ArchiveHandle archive_handle,
142 const FileSys::Path& path);
143
144/**
136 * Create a File in an Archive 145 * Create a File in an Archive
137 * @param archive_handle Handle to an open Archive object 146 * @param archive_handle Handle to an open Archive object
138 * @param path Path to the File inside of the Archive 147 * @param path Path to the File inside of the Archive
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index 94f053dc2..00edc7622 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -64,7 +64,7 @@ static void OpenFile(Service::Interface* self) {
64 u32 filename_ptr = cmd_buff[9]; 64 u32 filename_ptr = cmd_buff[9];
65 FileSys::Path file_path(filename_type, filename_size, filename_ptr); 65 FileSys::Path file_path(filename_type, filename_size, filename_ptr);
66 66
67 LOG_DEBUG(Service_FS, "path=%s, mode=%d attrs=%u", file_path.DebugStr().c_str(), mode.hex, 67 LOG_DEBUG(Service_FS, "path=%s, mode=%u attrs=%u", file_path.DebugStr().c_str(), mode.hex,
68 attributes); 68 attributes);
69 69
70 ResultVal<SharedPtr<File>> file_res = OpenFileFromArchive(archive_handle, file_path, mode); 70 ResultVal<SharedPtr<File>> file_res = OpenFileFromArchive(archive_handle, file_path, mode);
@@ -112,15 +112,15 @@ static void OpenFileDirectly(Service::Interface* self) {
112 FileSys::Path archive_path(archivename_type, archivename_size, archivename_ptr); 112 FileSys::Path archive_path(archivename_type, archivename_size, archivename_ptr);
113 FileSys::Path file_path(filename_type, filename_size, filename_ptr); 113 FileSys::Path file_path(filename_type, filename_size, filename_ptr);
114 114
115 LOG_DEBUG(Service_FS, "archive_id=0x%08X archive_path=%s file_path=%s, mode=%u attributes=%d", 115 LOG_DEBUG(Service_FS, "archive_id=0x%08X archive_path=%s file_path=%s, mode=%u attributes=%u",
116 archive_id, archive_path.DebugStr().c_str(), file_path.DebugStr().c_str(), mode.hex, 116 static_cast<u32>(archive_id), archive_path.DebugStr().c_str(),
117 attributes); 117 file_path.DebugStr().c_str(), mode.hex, attributes);
118 118
119 ResultVal<ArchiveHandle> archive_handle = OpenArchive(archive_id, archive_path); 119 ResultVal<ArchiveHandle> archive_handle = OpenArchive(archive_id, archive_path);
120 if (archive_handle.Failed()) { 120 if (archive_handle.Failed()) {
121 LOG_ERROR(Service_FS, 121 LOG_ERROR(Service_FS,
122 "failed to get a handle for archive archive_id=0x%08X archive_path=%s", 122 "failed to get a handle for archive archive_id=0x%08X archive_path=%s",
123 archive_id, archive_path.DebugStr().c_str()); 123 static_cast<u32>(archive_id), archive_path.DebugStr().c_str());
124 cmd_buff[1] = archive_handle.Code().raw; 124 cmd_buff[1] = archive_handle.Code().raw;
125 cmd_buff[3] = 0; 125 cmd_buff[3] = 0;
126 return; 126 return;
@@ -133,7 +133,7 @@ static void OpenFileDirectly(Service::Interface* self) {
133 cmd_buff[3] = Kernel::g_handle_table.Create(*file_res).MoveFrom(); 133 cmd_buff[3] = Kernel::g_handle_table.Create(*file_res).MoveFrom();
134 } else { 134 } else {
135 cmd_buff[3] = 0; 135 cmd_buff[3] = 0;
136 LOG_ERROR(Service_FS, "failed to get a handle for file %s mode=%u attributes=%d", 136 LOG_ERROR(Service_FS, "failed to get a handle for file %s mode=%u attributes=%u",
137 file_path.DebugStr().c_str(), mode.hex, attributes); 137 file_path.DebugStr().c_str(), mode.hex, attributes);
138 } 138 }
139} 139}
@@ -159,7 +159,7 @@ static void DeleteFile(Service::Interface* self) {
159 159
160 FileSys::Path file_path(filename_type, filename_size, filename_ptr); 160 FileSys::Path file_path(filename_type, filename_size, filename_ptr);
161 161
162 LOG_DEBUG(Service_FS, "type=%d size=%d data=%s", filename_type, filename_size, 162 LOG_DEBUG(Service_FS, "type=%u size=%u data=%s", static_cast<u32>(filename_type), filename_size,
163 file_path.DebugStr().c_str()); 163 file_path.DebugStr().c_str());
164 164
165 cmd_buff[1] = DeleteFileFromArchive(archive_handle, file_path).raw; 165 cmd_buff[1] = DeleteFileFromArchive(archive_handle, file_path).raw;
@@ -198,9 +198,10 @@ static void RenameFile(Service::Interface* self) {
198 FileSys::Path dest_file_path(dest_filename_type, dest_filename_size, dest_filename_ptr); 198 FileSys::Path dest_file_path(dest_filename_type, dest_filename_size, dest_filename_ptr);
199 199
200 LOG_DEBUG(Service_FS, 200 LOG_DEBUG(Service_FS,
201 "src_type=%d src_size=%d src_data=%s dest_type=%d dest_size=%d dest_data=%s", 201 "src_type=%u src_size=%u src_data=%s dest_type=%u dest_size=%u dest_data=%s",
202 src_filename_type, src_filename_size, src_file_path.DebugStr().c_str(), 202 static_cast<u32>(src_filename_type), src_filename_size,
203 dest_filename_type, dest_filename_size, dest_file_path.DebugStr().c_str()); 203 src_file_path.DebugStr().c_str(), static_cast<u32>(dest_filename_type),
204 dest_filename_size, dest_file_path.DebugStr().c_str());
204 205
205 cmd_buff[1] = RenameFileBetweenArchives(src_archive_handle, src_file_path, dest_archive_handle, 206 cmd_buff[1] = RenameFileBetweenArchives(src_archive_handle, src_file_path, dest_archive_handle,
206 dest_file_path) 207 dest_file_path)
@@ -228,13 +229,42 @@ static void DeleteDirectory(Service::Interface* self) {
228 229
229 FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr); 230 FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr);
230 231
231 LOG_DEBUG(Service_FS, "type=%d size=%d data=%s", dirname_type, dirname_size, 232 LOG_DEBUG(Service_FS, "type=%u size=%u data=%s", static_cast<u32>(dirname_type), dirname_size,
232 dir_path.DebugStr().c_str()); 233 dir_path.DebugStr().c_str());
233 234
234 cmd_buff[1] = DeleteDirectoryFromArchive(archive_handle, dir_path).raw; 235 cmd_buff[1] = DeleteDirectoryFromArchive(archive_handle, dir_path).raw;
235} 236}
236 237
237/* 238/*
239 * FS_User::DeleteDirectoryRecursively service function
240 * Inputs:
241 * 0 : Command header 0x08070142
242 * 1 : Transaction
243 * 2 : Archive handle lower word
244 * 3 : Archive handle upper word
245 * 4 : Directory path string type
246 * 5 : Directory path string size
247 * 7 : Directory path string data
248 * Outputs:
249 * 1 : Result of function, 0 on success, otherwise error code
250 */
251static void DeleteDirectoryRecursively(Service::Interface* self) {
252 u32* cmd_buff = Kernel::GetCommandBuffer();
253
254 ArchiveHandle archive_handle = MakeArchiveHandle(cmd_buff[2], cmd_buff[3]);
255 auto dirname_type = static_cast<FileSys::LowPathType>(cmd_buff[4]);
256 u32 dirname_size = cmd_buff[5];
257 u32 dirname_ptr = cmd_buff[7];
258
259 FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr);
260
261 LOG_DEBUG(Service_FS, "type=%u size=%u data=%s", static_cast<u32>(dirname_type), dirname_size,
262 dir_path.DebugStr().c_str());
263
264 cmd_buff[1] = DeleteDirectoryRecursivelyFromArchive(archive_handle, dir_path).raw;
265}
266
267/*
238 * FS_User::CreateFile service function 268 * FS_User::CreateFile service function
239 * Inputs: 269 * Inputs:
240 * 0 : Command header 0x08080202 270 * 0 : Command header 0x08080202
@@ -258,7 +288,7 @@ static void CreateFile(Service::Interface* self) {
258 288
259 FileSys::Path file_path(filename_type, filename_size, filename_ptr); 289 FileSys::Path file_path(filename_type, filename_size, filename_ptr);
260 290
261 LOG_DEBUG(Service_FS, "type=%d size=%llu data=%s", filename_type, file_size, 291 LOG_DEBUG(Service_FS, "type=%u size=%llu data=%s", static_cast<u32>(filename_type), file_size,
262 file_path.DebugStr().c_str()); 292 file_path.DebugStr().c_str());
263 293
264 cmd_buff[1] = CreateFileInArchive(archive_handle, file_path, file_size).raw; 294 cmd_buff[1] = CreateFileInArchive(archive_handle, file_path, file_size).raw;
@@ -285,7 +315,7 @@ static void CreateDirectory(Service::Interface* self) {
285 315
286 FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr); 316 FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr);
287 317
288 LOG_DEBUG(Service_FS, "type=%d size=%d data=%s", dirname_type, dirname_size, 318 LOG_DEBUG(Service_FS, "type=%u size=%d data=%s", static_cast<u32>(dirname_type), dirname_size,
289 dir_path.DebugStr().c_str()); 319 dir_path.DebugStr().c_str());
290 320
291 cmd_buff[1] = CreateDirectoryFromArchive(archive_handle, dir_path).raw; 321 cmd_buff[1] = CreateDirectoryFromArchive(archive_handle, dir_path).raw;
@@ -322,10 +352,10 @@ static void RenameDirectory(Service::Interface* self) {
322 FileSys::Path src_dir_path(src_dirname_type, src_dirname_size, src_dirname_ptr); 352 FileSys::Path src_dir_path(src_dirname_type, src_dirname_size, src_dirname_ptr);
323 FileSys::Path dest_dir_path(dest_dirname_type, dest_dirname_size, dest_dirname_ptr); 353 FileSys::Path dest_dir_path(dest_dirname_type, dest_dirname_size, dest_dirname_ptr);
324 354
325 LOG_DEBUG(Service_FS, 355 LOG_DEBUG(
326 "src_type=%d src_size=%d src_data=%s dest_type=%d dest_size=%d dest_data=%s", 356 Service_FS, "src_type=%u src_size=%u src_data=%s dest_type=%u dest_size=%u dest_data=%s",
327 src_dirname_type, src_dirname_size, src_dir_path.DebugStr().c_str(), 357 static_cast<u32>(src_dirname_type), src_dirname_size, src_dir_path.DebugStr().c_str(),
328 dest_dirname_type, dest_dirname_size, dest_dir_path.DebugStr().c_str()); 358 static_cast<u32>(dest_dirname_type), dest_dirname_size, dest_dir_path.DebugStr().c_str());
329 359
330 cmd_buff[1] = RenameDirectoryBetweenArchives(src_archive_handle, src_dir_path, 360 cmd_buff[1] = RenameDirectoryBetweenArchives(src_archive_handle, src_dir_path,
331 dest_archive_handle, dest_dir_path) 361 dest_archive_handle, dest_dir_path)
@@ -355,7 +385,7 @@ static void OpenDirectory(Service::Interface* self) {
355 385
356 FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr); 386 FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr);
357 387
358 LOG_DEBUG(Service_FS, "type=%d size=%d data=%s", dirname_type, dirname_size, 388 LOG_DEBUG(Service_FS, "type=%u size=%u data=%s", static_cast<u32>(dirname_type), dirname_size,
359 dir_path.DebugStr().c_str()); 389 dir_path.DebugStr().c_str());
360 390
361 ResultVal<SharedPtr<Directory>> dir_res = OpenDirectoryFromArchive(archive_handle, dir_path); 391 ResultVal<SharedPtr<Directory>> dir_res = OpenDirectoryFromArchive(archive_handle, dir_path);
@@ -390,7 +420,7 @@ static void OpenArchive(Service::Interface* self) {
390 u32 archivename_ptr = cmd_buff[5]; 420 u32 archivename_ptr = cmd_buff[5];
391 FileSys::Path archive_path(archivename_type, archivename_size, archivename_ptr); 421 FileSys::Path archive_path(archivename_type, archivename_size, archivename_ptr);
392 422
393 LOG_DEBUG(Service_FS, "archive_id=0x%08X archive_path=%s", archive_id, 423 LOG_DEBUG(Service_FS, "archive_id=0x%08X archive_path=%s", static_cast<u32>(archive_id),
394 archive_path.DebugStr().c_str()); 424 archive_path.DebugStr().c_str());
395 425
396 ResultVal<ArchiveHandle> handle = OpenArchive(archive_id, archive_path); 426 ResultVal<ArchiveHandle> handle = OpenArchive(archive_id, archive_path);
@@ -402,7 +432,7 @@ static void OpenArchive(Service::Interface* self) {
402 cmd_buff[2] = cmd_buff[3] = 0; 432 cmd_buff[2] = cmd_buff[3] = 0;
403 LOG_ERROR(Service_FS, 433 LOG_ERROR(Service_FS,
404 "failed to get a handle for archive archive_id=0x%08X archive_path=%s", 434 "failed to get a handle for archive archive_id=0x%08X archive_path=%s",
405 archive_id, archive_path.DebugStr().c_str()); 435 static_cast<u32>(archive_id), archive_path.DebugStr().c_str());
406 } 436 }
407} 437}
408 438
@@ -485,7 +515,8 @@ static void FormatSaveData(Service::Interface* self) {
485 LOG_DEBUG(Service_FS, "archive_path=%s", archive_path.DebugStr().c_str()); 515 LOG_DEBUG(Service_FS, "archive_path=%s", archive_path.DebugStr().c_str());
486 516
487 if (archive_id != FS::ArchiveIdCode::SaveData) { 517 if (archive_id != FS::ArchiveIdCode::SaveData) {
488 LOG_ERROR(Service_FS, "tried to format an archive different than SaveData, %u", archive_id); 518 LOG_ERROR(Service_FS, "tried to format an archive different than SaveData, %u",
519 static_cast<u32>(archive_id));
489 cmd_buff[1] = ResultCode(ErrorDescription::FS_InvalidPath, ErrorModule::FS, 520 cmd_buff[1] = ResultCode(ErrorDescription::FS_InvalidPath, ErrorModule::FS,
490 ErrorSummary::InvalidArgument, ErrorLevel::Usage) 521 ErrorSummary::InvalidArgument, ErrorLevel::Usage)
491 .raw; 522 .raw;
@@ -868,7 +899,7 @@ const Interface::FunctionInfo FunctionTable[] = {
868 {0x08040142, DeleteFile, "DeleteFile"}, 899 {0x08040142, DeleteFile, "DeleteFile"},
869 {0x08050244, RenameFile, "RenameFile"}, 900 {0x08050244, RenameFile, "RenameFile"},
870 {0x08060142, DeleteDirectory, "DeleteDirectory"}, 901 {0x08060142, DeleteDirectory, "DeleteDirectory"},
871 {0x08070142, nullptr, "DeleteDirectoryRecursively"}, 902 {0x08070142, DeleteDirectoryRecursively, "DeleteDirectoryRecursively"},
872 {0x08080202, CreateFile, "CreateFile"}, 903 {0x08080202, CreateFile, "CreateFile"},
873 {0x08090182, CreateDirectory, "CreateDirectory"}, 904 {0x08090182, CreateDirectory, "CreateDirectory"},
874 {0x080A0244, RenameDirectory, "RenameDirectory"}, 905 {0x080A0244, RenameDirectory, "RenameDirectory"},
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 0e6b91e3a..28cb97d8e 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -80,6 +80,319 @@ static Math::Vec4<u8> DecodePixel(Regs::PixelFormat input_format, const u8* src_
80MICROPROFILE_DEFINE(GPU_DisplayTransfer, "GPU", "DisplayTransfer", MP_RGB(100, 100, 255)); 80MICROPROFILE_DEFINE(GPU_DisplayTransfer, "GPU", "DisplayTransfer", MP_RGB(100, 100, 255));
81MICROPROFILE_DEFINE(GPU_CmdlistProcessing, "GPU", "Cmdlist Processing", MP_RGB(100, 255, 100)); 81MICROPROFILE_DEFINE(GPU_CmdlistProcessing, "GPU", "Cmdlist Processing", MP_RGB(100, 255, 100));
82 82
83static void MemoryFill(const Regs::MemoryFillConfig& config) {
84 const PAddr start_addr = config.GetStartAddress();
85 const PAddr end_addr = config.GetEndAddress();
86
87 // TODO: do hwtest with these cases
88 if (!Memory::IsValidPhysicalAddress(start_addr)) {
89 LOG_CRITICAL(HW_GPU, "invalid start address 0x%08X", start_addr);
90 return;
91 }
92
93 if (!Memory::IsValidPhysicalAddress(end_addr)) {
94 LOG_CRITICAL(HW_GPU, "invalid end address 0x%08X", end_addr);
95 return;
96 }
97
98 if (end_addr <= start_addr) {
99 LOG_CRITICAL(HW_GPU, "invalid memory range from 0x%08X to 0x%08X", start_addr, end_addr);
100 return;
101 }
102
103 u8* start = Memory::GetPhysicalPointer(start_addr);
104 u8* end = Memory::GetPhysicalPointer(end_addr);
105
106 // TODO: Consider always accelerating and returning vector of
107 // regions that the accelerated fill did not cover to
108 // reduce/eliminate the fill that the cpu has to do.
109 // This would also mean that the flush below is not needed.
110 // Fill should first flush all surfaces that touch but are
111 // not completely within the fill range.
112 // Then fill all completely covered surfaces, and return the
113 // regions that were between surfaces or within the touching
114 // ones for cpu to manually fill here.
115 if (VideoCore::g_renderer->Rasterizer()->AccelerateFill(config))
116 return;
117
118 Memory::RasterizerFlushAndInvalidateRegion(config.GetStartAddress(),
119 config.GetEndAddress() - config.GetStartAddress());
120
121 if (config.fill_24bit) {
122 // fill with 24-bit values
123 for (u8* ptr = start; ptr < end; ptr += 3) {
124 ptr[0] = config.value_24bit_r;
125 ptr[1] = config.value_24bit_g;
126 ptr[2] = config.value_24bit_b;
127 }
128 } else if (config.fill_32bit) {
129 // fill with 32-bit values
130 if (end > start) {
131 u32 value = config.value_32bit;
132 size_t len = (end - start) / sizeof(u32);
133 for (size_t i = 0; i < len; ++i)
134 memcpy(&start[i * sizeof(u32)], &value, sizeof(u32));
135 }
136 } else {
137 // fill with 16-bit values
138 u16 value_16bit = config.value_16bit.Value();
139 for (u8* ptr = start; ptr < end; ptr += sizeof(u16))
140 memcpy(ptr, &value_16bit, sizeof(u16));
141 }
142}
143
144static void DisplayTransfer(const Regs::DisplayTransferConfig& config) {
145 const PAddr src_addr = config.GetPhysicalInputAddress();
146 const PAddr dst_addr = config.GetPhysicalOutputAddress();
147
148 // TODO: do hwtest with these cases
149 if (!Memory::IsValidPhysicalAddress(src_addr)) {
150 LOG_CRITICAL(HW_GPU, "invalid input address 0x%08X", src_addr);
151 return;
152 }
153
154 if (!Memory::IsValidPhysicalAddress(dst_addr)) {
155 LOG_CRITICAL(HW_GPU, "invalid output address 0x%08X", dst_addr);
156 return;
157 }
158
159 if (config.input_width == 0) {
160 LOG_CRITICAL(HW_GPU, "zero input width");
161 return;
162 }
163
164 if (config.input_height == 0) {
165 LOG_CRITICAL(HW_GPU, "zero input height");
166 return;
167 }
168
169 if (config.output_width == 0) {
170 LOG_CRITICAL(HW_GPU, "zero output width");
171 return;
172 }
173
174 if (config.output_height == 0) {
175 LOG_CRITICAL(HW_GPU, "zero output height");
176 return;
177 }
178
179 if (VideoCore::g_renderer->Rasterizer()->AccelerateDisplayTransfer(config))
180 return;
181
182 u8* src_pointer = Memory::GetPhysicalPointer(src_addr);
183 u8* dst_pointer = Memory::GetPhysicalPointer(dst_addr);
184
185 if (config.scaling > config.ScaleXY) {
186 LOG_CRITICAL(HW_GPU, "Unimplemented display transfer scaling mode %u",
187 config.scaling.Value());
188 UNIMPLEMENTED();
189 return;
190 }
191
192 if (config.input_linear && config.scaling != config.NoScale) {
193 LOG_CRITICAL(HW_GPU, "Scaling is only implemented on tiled input");
194 UNIMPLEMENTED();
195 return;
196 }
197
198 int horizontal_scale = config.scaling != config.NoScale ? 1 : 0;
199 int vertical_scale = config.scaling == config.ScaleXY ? 1 : 0;
200
201 u32 output_width = config.output_width >> horizontal_scale;
202 u32 output_height = config.output_height >> vertical_scale;
203
204 u32 input_size =
205 config.input_width * config.input_height * GPU::Regs::BytesPerPixel(config.input_format);
206 u32 output_size = output_width * output_height * GPU::Regs::BytesPerPixel(config.output_format);
207
208 Memory::RasterizerFlushRegion(config.GetPhysicalInputAddress(), input_size);
209 Memory::RasterizerFlushAndInvalidateRegion(config.GetPhysicalOutputAddress(), output_size);
210
211 for (u32 y = 0; y < output_height; ++y) {
212 for (u32 x = 0; x < output_width; ++x) {
213 Math::Vec4<u8> src_color;
214
215 // Calculate the [x,y] position of the input image
216 // based on the current output position and the scale
217 u32 input_x = x << horizontal_scale;
218 u32 input_y = y << vertical_scale;
219
220 u32 output_y;
221 if (config.flip_vertically) {
222 // Flip the y value of the output data,
223 // we do this after calculating the [x,y] position of the input image
224 // to account for the scaling options.
225 output_y = output_height - y - 1;
226 } else {
227 output_y = y;
228 }
229
230 u32 dst_bytes_per_pixel = GPU::Regs::BytesPerPixel(config.output_format);
231 u32 src_bytes_per_pixel = GPU::Regs::BytesPerPixel(config.input_format);
232 u32 src_offset;
233 u32 dst_offset;
234
235 if (config.input_linear) {
236 if (!config.dont_swizzle) {
237 // Interpret the input as linear and the output as tiled
238 u32 coarse_y = output_y & ~7;
239 u32 stride = output_width * dst_bytes_per_pixel;
240
241 src_offset = (input_x + input_y * config.input_width) * src_bytes_per_pixel;
242 dst_offset = VideoCore::GetMortonOffset(x, output_y, dst_bytes_per_pixel) +
243 coarse_y * stride;
244 } else {
245 // Both input and output are linear
246 src_offset = (input_x + input_y * config.input_width) * src_bytes_per_pixel;
247 dst_offset = (x + output_y * output_width) * dst_bytes_per_pixel;
248 }
249 } else {
250 if (!config.dont_swizzle) {
251 // Interpret the input as tiled and the output as linear
252 u32 coarse_y = input_y & ~7;
253 u32 stride = config.input_width * src_bytes_per_pixel;
254
255 src_offset = VideoCore::GetMortonOffset(input_x, input_y, src_bytes_per_pixel) +
256 coarse_y * stride;
257 dst_offset = (x + output_y * output_width) * dst_bytes_per_pixel;
258 } else {
259 // Both input and output are tiled
260 u32 out_coarse_y = output_y & ~7;
261 u32 out_stride = output_width * dst_bytes_per_pixel;
262
263 u32 in_coarse_y = input_y & ~7;
264 u32 in_stride = config.input_width * src_bytes_per_pixel;
265
266 src_offset = VideoCore::GetMortonOffset(input_x, input_y, src_bytes_per_pixel) +
267 in_coarse_y * in_stride;
268 dst_offset = VideoCore::GetMortonOffset(x, output_y, dst_bytes_per_pixel) +
269 out_coarse_y * out_stride;
270 }
271 }
272
273 const u8* src_pixel = src_pointer + src_offset;
274 src_color = DecodePixel(config.input_format, src_pixel);
275 if (config.scaling == config.ScaleX) {
276 Math::Vec4<u8> pixel =
277 DecodePixel(config.input_format, src_pixel + src_bytes_per_pixel);
278 src_color = ((src_color + pixel) / 2).Cast<u8>();
279 } else if (config.scaling == config.ScaleXY) {
280 Math::Vec4<u8> pixel1 =
281 DecodePixel(config.input_format, src_pixel + 1 * src_bytes_per_pixel);
282 Math::Vec4<u8> pixel2 =
283 DecodePixel(config.input_format, src_pixel + 2 * src_bytes_per_pixel);
284 Math::Vec4<u8> pixel3 =
285 DecodePixel(config.input_format, src_pixel + 3 * src_bytes_per_pixel);
286 src_color = (((src_color + pixel1) + (pixel2 + pixel3)) / 4).Cast<u8>();
287 }
288
289 u8* dst_pixel = dst_pointer + dst_offset;
290 switch (config.output_format) {
291 case Regs::PixelFormat::RGBA8:
292 Color::EncodeRGBA8(src_color, dst_pixel);
293 break;
294
295 case Regs::PixelFormat::RGB8:
296 Color::EncodeRGB8(src_color, dst_pixel);
297 break;
298
299 case Regs::PixelFormat::RGB565:
300 Color::EncodeRGB565(src_color, dst_pixel);
301 break;
302
303 case Regs::PixelFormat::RGB5A1:
304 Color::EncodeRGB5A1(src_color, dst_pixel);
305 break;
306
307 case Regs::PixelFormat::RGBA4:
308 Color::EncodeRGBA4(src_color, dst_pixel);
309 break;
310
311 default:
312 LOG_ERROR(HW_GPU, "Unknown destination framebuffer format %x",
313 config.output_format.Value());
314 break;
315 }
316 }
317 }
318}
319
320static void TextureCopy(const Regs::DisplayTransferConfig& config) {
321 const PAddr src_addr = config.GetPhysicalInputAddress();
322 const PAddr dst_addr = config.GetPhysicalOutputAddress();
323
324 // TODO: do hwtest with these cases
325 if (!Memory::IsValidPhysicalAddress(src_addr)) {
326 LOG_CRITICAL(HW_GPU, "invalid input address 0x%08X", src_addr);
327 return;
328 }
329
330 if (!Memory::IsValidPhysicalAddress(dst_addr)) {
331 LOG_CRITICAL(HW_GPU, "invalid output address 0x%08X", dst_addr);
332 return;
333 }
334
335 if (config.texture_copy.input_width == 0) {
336 LOG_CRITICAL(HW_GPU, "zero input width");
337 return;
338 }
339
340 if (config.texture_copy.output_width == 0) {
341 LOG_CRITICAL(HW_GPU, "zero output width");
342 return;
343 }
344
345 if (config.texture_copy.size == 0) {
346 LOG_CRITICAL(HW_GPU, "zero size");
347 return;
348 }
349
350 if (VideoCore::g_renderer->Rasterizer()->AccelerateTextureCopy(config))
351 return;
352
353 u8* src_pointer = Memory::GetPhysicalPointer(src_addr);
354 u8* dst_pointer = Memory::GetPhysicalPointer(dst_addr);
355
356 u32 input_width = config.texture_copy.input_width * 16;
357 u32 input_gap = config.texture_copy.input_gap * 16;
358 u32 output_width = config.texture_copy.output_width * 16;
359 u32 output_gap = config.texture_copy.output_gap * 16;
360
361 size_t contiguous_input_size =
362 config.texture_copy.size / input_width * (input_width + input_gap);
363 Memory::RasterizerFlushRegion(config.GetPhysicalInputAddress(),
364 static_cast<u32>(contiguous_input_size));
365
366 size_t contiguous_output_size =
367 config.texture_copy.size / output_width * (output_width + output_gap);
368 Memory::RasterizerFlushAndInvalidateRegion(config.GetPhysicalOutputAddress(),
369 static_cast<u32>(contiguous_output_size));
370
371 u32 remaining_size = config.texture_copy.size;
372 u32 remaining_input = input_width;
373 u32 remaining_output = output_width;
374 while (remaining_size > 0) {
375 u32 copy_size = std::min({remaining_input, remaining_output, remaining_size});
376
377 std::memcpy(dst_pointer, src_pointer, copy_size);
378 src_pointer += copy_size;
379 dst_pointer += copy_size;
380
381 remaining_input -= copy_size;
382 remaining_output -= copy_size;
383 remaining_size -= copy_size;
384
385 if (remaining_input == 0) {
386 remaining_input = input_width;
387 src_pointer += input_gap;
388 }
389 if (remaining_output == 0) {
390 remaining_output = output_width;
391 dst_pointer += output_gap;
392 }
393 }
394}
395
83template <typename T> 396template <typename T>
84inline void Write(u32 addr, const T data) { 397inline void Write(u32 addr, const T data) {
85 addr -= HW::VADDR_GPU; 398 addr -= HW::VADDR_GPU;
@@ -102,50 +415,13 @@ inline void Write(u32 addr, const T data) {
102 auto& config = g_regs.memory_fill_config[is_second_filler]; 415 auto& config = g_regs.memory_fill_config[is_second_filler];
103 416
104 if (config.trigger) { 417 if (config.trigger) {
105 if (config.address_start) { // Some games pass invalid values here 418 MemoryFill(config);
106 u8* start = Memory::GetPhysicalPointer(config.GetStartAddress()); 419 LOG_TRACE(HW_GPU, "MemoryFill from 0x%08x to 0x%08x", config.GetStartAddress(),
107 u8* end = Memory::GetPhysicalPointer(config.GetEndAddress()); 420 config.GetEndAddress());
108
109 // TODO: Consider always accelerating and returning vector of
110 // regions that the accelerated fill did not cover to
111 // reduce/eliminate the fill that the cpu has to do.
112 // This would also mean that the flush below is not needed.
113 // Fill should first flush all surfaces that touch but are
114 // not completely within the fill range.
115 // Then fill all completely covered surfaces, and return the
116 // regions that were between surfaces or within the touching
117 // ones for cpu to manually fill here.
118 if (!VideoCore::g_renderer->Rasterizer()->AccelerateFill(config)) {
119 Memory::RasterizerFlushAndInvalidateRegion(config.GetStartAddress(),
120 config.GetEndAddress() -
121 config.GetStartAddress());
122
123 if (config.fill_24bit) {
124 // fill with 24-bit values
125 for (u8* ptr = start; ptr < end; ptr += 3) {
126 ptr[0] = config.value_24bit_r;
127 ptr[1] = config.value_24bit_g;
128 ptr[2] = config.value_24bit_b;
129 }
130 } else if (config.fill_32bit) {
131 // fill with 32-bit values
132 if (end > start) {
133 u32 value = config.value_32bit;
134 size_t len = (end - start) / sizeof(u32);
135 for (size_t i = 0; i < len; ++i)
136 memcpy(&start[i * sizeof(u32)], &value, sizeof(u32));
137 }
138 } else {
139 // fill with 16-bit values
140 u16 value_16bit = config.value_16bit.Value();
141 for (u8* ptr = start; ptr < end; ptr += sizeof(u16))
142 memcpy(ptr, &value_16bit, sizeof(u16));
143 }
144 }
145
146 LOG_TRACE(HW_GPU, "MemoryFill from 0x%08x to 0x%08x", config.GetStartAddress(),
147 config.GetEndAddress());
148 421
422 // It seems that it won't signal interrupt if "address_start" is zero.
423 // TODO: hwtest this
424 if (config.GetStartAddress() != 0) {
149 if (!is_second_filler) { 425 if (!is_second_filler) {
150 GSP_GPU::SignalInterrupt(GSP_GPU::InterruptId::PSC0); 426 GSP_GPU::SignalInterrupt(GSP_GPU::InterruptId::PSC0);
151 } else { 427 } else {
@@ -171,207 +447,22 @@ inline void Write(u32 addr, const T data) {
171 Pica::g_debug_context->OnEvent(Pica::DebugContext::Event::IncomingDisplayTransfer, 447 Pica::g_debug_context->OnEvent(Pica::DebugContext::Event::IncomingDisplayTransfer,
172 nullptr); 448 nullptr);
173 449
174 if (!VideoCore::g_renderer->Rasterizer()->AccelerateDisplayTransfer(config)) { 450 if (config.is_texture_copy) {
175 u8* src_pointer = Memory::GetPhysicalPointer(config.GetPhysicalInputAddress()); 451 TextureCopy(config);
176 u8* dst_pointer = Memory::GetPhysicalPointer(config.GetPhysicalOutputAddress()); 452 LOG_TRACE(HW_GPU, "TextureCopy: 0x%X bytes from 0x%08X(%u+%u)-> "
177 453 "0x%08X(%u+%u), flags 0x%08X",
178 if (config.is_texture_copy) { 454 config.texture_copy.size, config.GetPhysicalInputAddress(),
179 u32 input_width = config.texture_copy.input_width * 16; 455 config.texture_copy.input_width * 16, config.texture_copy.input_gap * 16,
180 u32 input_gap = config.texture_copy.input_gap * 16; 456 config.GetPhysicalOutputAddress(), config.texture_copy.output_width * 16,
181 u32 output_width = config.texture_copy.output_width * 16; 457 config.texture_copy.output_gap * 16, config.flags);
182 u32 output_gap = config.texture_copy.output_gap * 16; 458 } else {
183 459 DisplayTransfer(config);
184 size_t contiguous_input_size = 460 LOG_TRACE(HW_GPU, "DisplayTransfer: 0x%08x(%ux%u)-> "
185 config.texture_copy.size / input_width * (input_width + input_gap);
186 Memory::RasterizerFlushRegion(config.GetPhysicalInputAddress(),
187 static_cast<u32>(contiguous_input_size));
188
189 size_t contiguous_output_size =
190 config.texture_copy.size / output_width * (output_width + output_gap);
191 Memory::RasterizerFlushAndInvalidateRegion(
192 config.GetPhysicalOutputAddress(),
193 static_cast<u32>(contiguous_output_size));
194
195 u32 remaining_size = config.texture_copy.size;
196 u32 remaining_input = input_width;
197 u32 remaining_output = output_width;
198 while (remaining_size > 0) {
199 u32 copy_size =
200 std::min({remaining_input, remaining_output, remaining_size});
201
202 std::memcpy(dst_pointer, src_pointer, copy_size);
203 src_pointer += copy_size;
204 dst_pointer += copy_size;
205
206 remaining_input -= copy_size;
207 remaining_output -= copy_size;
208 remaining_size -= copy_size;
209
210 if (remaining_input == 0) {
211 remaining_input = input_width;
212 src_pointer += input_gap;
213 }
214 if (remaining_output == 0) {
215 remaining_output = output_width;
216 dst_pointer += output_gap;
217 }
218 }
219
220 LOG_TRACE(
221 HW_GPU,
222 "TextureCopy: 0x%X bytes from 0x%08X(%u+%u)-> 0x%08X(%u+%u), flags 0x%08X",
223 config.texture_copy.size, config.GetPhysicalInputAddress(), input_width,
224 input_gap, config.GetPhysicalOutputAddress(), output_width, output_gap,
225 config.flags);
226
227 GSP_GPU::SignalInterrupt(GSP_GPU::InterruptId::PPF);
228 break;
229 }
230
231 if (config.scaling > config.ScaleXY) {
232 LOG_CRITICAL(HW_GPU, "Unimplemented display transfer scaling mode %u",
233 config.scaling.Value());
234 UNIMPLEMENTED();
235 break;
236 }
237
238 if (config.input_linear && config.scaling != config.NoScale) {
239 LOG_CRITICAL(HW_GPU, "Scaling is only implemented on tiled input");
240 UNIMPLEMENTED();
241 break;
242 }
243
244 int horizontal_scale = config.scaling != config.NoScale ? 1 : 0;
245 int vertical_scale = config.scaling == config.ScaleXY ? 1 : 0;
246
247 u32 output_width = config.output_width >> horizontal_scale;
248 u32 output_height = config.output_height >> vertical_scale;
249
250 u32 input_size = config.input_width * config.input_height *
251 GPU::Regs::BytesPerPixel(config.input_format);
252 u32 output_size =
253 output_width * output_height * GPU::Regs::BytesPerPixel(config.output_format);
254
255 Memory::RasterizerFlushRegion(config.GetPhysicalInputAddress(), input_size);
256 Memory::RasterizerFlushAndInvalidateRegion(config.GetPhysicalOutputAddress(),
257 output_size);
258
259 for (u32 y = 0; y < output_height; ++y) {
260 for (u32 x = 0; x < output_width; ++x) {
261 Math::Vec4<u8> src_color;
262
263 // Calculate the [x,y] position of the input image
264 // based on the current output position and the scale
265 u32 input_x = x << horizontal_scale;
266 u32 input_y = y << vertical_scale;
267
268 if (config.flip_vertically) {
269 // Flip the y value of the output data,
270 // we do this after calculating the [x,y] position of the input image
271 // to account for the scaling options.
272 y = output_height - y - 1;
273 }
274
275 u32 dst_bytes_per_pixel = GPU::Regs::BytesPerPixel(config.output_format);
276 u32 src_bytes_per_pixel = GPU::Regs::BytesPerPixel(config.input_format);
277 u32 src_offset;
278 u32 dst_offset;
279
280 if (config.input_linear) {
281 if (!config.dont_swizzle) {
282 // Interpret the input as linear and the output as tiled
283 u32 coarse_y = y & ~7;
284 u32 stride = output_width * dst_bytes_per_pixel;
285
286 src_offset =
287 (input_x + input_y * config.input_width) * src_bytes_per_pixel;
288 dst_offset = VideoCore::GetMortonOffset(x, y, dst_bytes_per_pixel) +
289 coarse_y * stride;
290 } else {
291 // Both input and output are linear
292 src_offset =
293 (input_x + input_y * config.input_width) * src_bytes_per_pixel;
294 dst_offset = (x + y * output_width) * dst_bytes_per_pixel;
295 }
296 } else {
297 if (!config.dont_swizzle) {
298 // Interpret the input as tiled and the output as linear
299 u32 coarse_y = input_y & ~7;
300 u32 stride = config.input_width * src_bytes_per_pixel;
301
302 src_offset = VideoCore::GetMortonOffset(input_x, input_y,
303 src_bytes_per_pixel) +
304 coarse_y * stride;
305 dst_offset = (x + y * output_width) * dst_bytes_per_pixel;
306 } else {
307 // Both input and output are tiled
308 u32 out_coarse_y = y & ~7;
309 u32 out_stride = output_width * dst_bytes_per_pixel;
310
311 u32 in_coarse_y = input_y & ~7;
312 u32 in_stride = config.input_width * src_bytes_per_pixel;
313
314 src_offset = VideoCore::GetMortonOffset(input_x, input_y,
315 src_bytes_per_pixel) +
316 in_coarse_y * in_stride;
317 dst_offset = VideoCore::GetMortonOffset(x, y, dst_bytes_per_pixel) +
318 out_coarse_y * out_stride;
319 }
320 }
321
322 const u8* src_pixel = src_pointer + src_offset;
323 src_color = DecodePixel(config.input_format, src_pixel);
324 if (config.scaling == config.ScaleX) {
325 Math::Vec4<u8> pixel =
326 DecodePixel(config.input_format, src_pixel + src_bytes_per_pixel);
327 src_color = ((src_color + pixel) / 2).Cast<u8>();
328 } else if (config.scaling == config.ScaleXY) {
329 Math::Vec4<u8> pixel1 = DecodePixel(
330 config.input_format, src_pixel + 1 * src_bytes_per_pixel);
331 Math::Vec4<u8> pixel2 = DecodePixel(
332 config.input_format, src_pixel + 2 * src_bytes_per_pixel);
333 Math::Vec4<u8> pixel3 = DecodePixel(
334 config.input_format, src_pixel + 3 * src_bytes_per_pixel);
335 src_color = (((src_color + pixel1) + (pixel2 + pixel3)) / 4).Cast<u8>();
336 }
337
338 u8* dst_pixel = dst_pointer + dst_offset;
339 switch (config.output_format) {
340 case Regs::PixelFormat::RGBA8:
341 Color::EncodeRGBA8(src_color, dst_pixel);
342 break;
343
344 case Regs::PixelFormat::RGB8:
345 Color::EncodeRGB8(src_color, dst_pixel);
346 break;
347
348 case Regs::PixelFormat::RGB565:
349 Color::EncodeRGB565(src_color, dst_pixel);
350 break;
351
352 case Regs::PixelFormat::RGB5A1:
353 Color::EncodeRGB5A1(src_color, dst_pixel);
354 break;
355
356 case Regs::PixelFormat::RGBA4:
357 Color::EncodeRGBA4(src_color, dst_pixel);
358 break;
359
360 default:
361 LOG_ERROR(HW_GPU, "Unknown destination framebuffer format %x",
362 config.output_format.Value());
363 break;
364 }
365 }
366 }
367
368 LOG_TRACE(HW_GPU, "DisplayTriggerTransfer: 0x%08x bytes from 0x%08x(%ux%u)-> "
369 "0x%08x(%ux%u), dst format %x, flags 0x%08X", 461 "0x%08x(%ux%u), dst format %x, flags 0x%08X",
370 config.output_height * output_width *
371 GPU::Regs::BytesPerPixel(config.output_format),
372 config.GetPhysicalInputAddress(), config.input_width.Value(), 462 config.GetPhysicalInputAddress(), config.input_width.Value(),
373 config.input_height.Value(), config.GetPhysicalOutputAddress(), 463 config.input_height.Value(), config.GetPhysicalOutputAddress(),
374 output_width, output_height, config.output_format.Value(), config.flags); 464 config.output_width.Value(), config.output_height.Value(),
465 config.output_format.Value(), config.flags);
375 } 466 }
376 467
377 g_regs.display_transfer_config.trigger = 0; 468 g_regs.display_transfer_config.trigger = 0;
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index df029d655..64c388374 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -251,6 +251,9 @@ bool IsValidVirtualAddress(const VAddr vaddr) {
251 if (page_pointer) 251 if (page_pointer)
252 return true; 252 return true;
253 253
254 if (current_page_table->attributes[vaddr >> PAGE_BITS] == PageType::RasterizerCachedMemory)
255 return true;
256
254 if (current_page_table->attributes[vaddr >> PAGE_BITS] != PageType::Special) 257 if (current_page_table->attributes[vaddr >> PAGE_BITS] != PageType::Special)
255 return false; 258 return false;
256 259
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h
index 71df233b5..8ef7e74c7 100644
--- a/src/video_core/rasterizer_interface.h
+++ b/src/video_core/rasterizer_interface.h
@@ -42,11 +42,16 @@ public:
42 /// and invalidated 42 /// and invalidated
43 virtual void FlushAndInvalidateRegion(PAddr addr, u32 size) = 0; 43 virtual void FlushAndInvalidateRegion(PAddr addr, u32 size) = 0;
44 44
45 /// Attempt to use a faster method to perform a display transfer 45 /// Attempt to use a faster method to perform a display transfer with is_texture_copy = 0
46 virtual bool AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) { 46 virtual bool AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) {
47 return false; 47 return false;
48 } 48 }
49 49
50 /// Attempt to use a faster method to perform a display transfer with is_texture_copy = 1
51 virtual bool AccelerateTextureCopy(const GPU::Regs::DisplayTransferConfig& config) {
52 return false;
53 }
54
50 /// Attempt to use a faster method to fill a region 55 /// Attempt to use a faster method to fill a region
51 virtual bool AccelerateFill(const GPU::Regs::MemoryFillConfig& config) { 56 virtual bool AccelerateFill(const GPU::Regs::MemoryFillConfig& config) {
52 return false; 57 return false;
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 60c9d9180..7cc3b407a 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -211,6 +211,27 @@ void RasterizerOpenGL::DrawTriangles() {
211 uniform_block_data.dirty = true; 211 uniform_block_data.dirty = true;
212 } 212 }
213 213
214 // Scissor checks are window-, not viewport-relative, which means that if the cached texture
215 // sub-rect changes, the scissor bounds also need to be updated.
216 GLint scissor_x1 = rect.left + regs.scissor_test.x1 * color_surface->res_scale_width;
217 GLint scissor_y1 = rect.bottom + regs.scissor_test.y1 * color_surface->res_scale_height;
218 // x2, y2 have +1 added to cover the entire pixel area, otherwise you might get cracks when
219 // scaling or doing multisampling.
220 GLint scissor_x2 = rect.left + (regs.scissor_test.x2 + 1) * color_surface->res_scale_width;
221 GLint scissor_y2 = rect.bottom + (regs.scissor_test.y2 + 1) * color_surface->res_scale_height;
222
223 if (uniform_block_data.data.scissor_x1 != scissor_x1 ||
224 uniform_block_data.data.scissor_x2 != scissor_x2 ||
225 uniform_block_data.data.scissor_y1 != scissor_y1 ||
226 uniform_block_data.data.scissor_y2 != scissor_y2) {
227
228 uniform_block_data.data.scissor_x1 = scissor_x1;
229 uniform_block_data.data.scissor_x2 = scissor_x2;
230 uniform_block_data.data.scissor_y1 = scissor_y1;
231 uniform_block_data.data.scissor_y2 = scissor_y2;
232 uniform_block_data.dirty = true;
233 }
234
214 // Sync and bind the texture surfaces 235 // Sync and bind the texture surfaces
215 const auto pica_textures = regs.GetTextures(); 236 const auto pica_textures = regs.GetTextures();
216 for (unsigned texture_index = 0; texture_index < pica_textures.size(); ++texture_index) { 237 for (unsigned texture_index = 0; texture_index < pica_textures.size(); ++texture_index) {
@@ -374,10 +395,6 @@ void RasterizerOpenGL::NotifyPicaRegisterChanged(u32 id) {
374 case PICA_REG_INDEX(scissor_test.mode): 395 case PICA_REG_INDEX(scissor_test.mode):
375 shader_dirty = true; 396 shader_dirty = true;
376 break; 397 break;
377 case PICA_REG_INDEX(scissor_test.x1): // and y1
378 case PICA_REG_INDEX(scissor_test.x2): // and y2
379 SyncScissorTest();
380 break;
381 398
382 // Logic op 399 // Logic op
383 case PICA_REG_INDEX(output_merger.logic_op): 400 case PICA_REG_INDEX(output_merger.logic_op):
@@ -692,11 +709,6 @@ bool RasterizerOpenGL::AccelerateDisplayTransfer(const GPU::Regs::DisplayTransfe
692 using PixelFormat = CachedSurface::PixelFormat; 709 using PixelFormat = CachedSurface::PixelFormat;
693 using SurfaceType = CachedSurface::SurfaceType; 710 using SurfaceType = CachedSurface::SurfaceType;
694 711
695 if (config.is_texture_copy) {
696 // TODO(tfarley): Try to hardware accelerate this
697 return false;
698 }
699
700 CachedSurface src_params; 712 CachedSurface src_params;
701 src_params.addr = config.GetPhysicalInputAddress(); 713 src_params.addr = config.GetPhysicalInputAddress();
702 src_params.width = config.output_width; 714 src_params.width = config.output_width;
@@ -751,6 +763,11 @@ bool RasterizerOpenGL::AccelerateDisplayTransfer(const GPU::Regs::DisplayTransfe
751 return true; 763 return true;
752} 764}
753 765
766bool RasterizerOpenGL::AccelerateTextureCopy(const GPU::Regs::DisplayTransferConfig& config) {
767 // TODO(tfarley): Try to hardware accelerate this
768 return false;
769}
770
754bool RasterizerOpenGL::AccelerateFill(const GPU::Regs::MemoryFillConfig& config) { 771bool RasterizerOpenGL::AccelerateFill(const GPU::Regs::MemoryFillConfig& config) {
755 using PixelFormat = CachedSurface::PixelFormat; 772 using PixelFormat = CachedSurface::PixelFormat;
756 using SurfaceType = CachedSurface::SurfaceType; 773 using SurfaceType = CachedSurface::SurfaceType;
@@ -1061,7 +1078,6 @@ void RasterizerOpenGL::SetShader() {
1061 SyncDepthOffset(); 1078 SyncDepthOffset();
1062 SyncAlphaTest(); 1079 SyncAlphaTest();
1063 SyncCombinerColor(); 1080 SyncCombinerColor();
1064 SyncScissorTest();
1065 auto& tev_stages = Pica::g_state.regs.GetTevStages(); 1081 auto& tev_stages = Pica::g_state.regs.GetTevStages();
1066 for (int index = 0; index < tev_stages.size(); ++index) 1082 for (int index = 0; index < tev_stages.size(); ++index)
1067 SyncTevConstColor(index, tev_stages[index]); 1083 SyncTevConstColor(index, tev_stages[index]);
@@ -1236,22 +1252,6 @@ void RasterizerOpenGL::SyncDepthTest() {
1236 : GL_ALWAYS; 1252 : GL_ALWAYS;
1237} 1253}
1238 1254
1239void RasterizerOpenGL::SyncScissorTest() {
1240 const auto& regs = Pica::g_state.regs;
1241
1242 if (uniform_block_data.data.scissor_x1 != regs.scissor_test.x1 ||
1243 uniform_block_data.data.scissor_y1 != regs.scissor_test.y1 ||
1244 uniform_block_data.data.scissor_x2 != regs.scissor_test.x2 ||
1245 uniform_block_data.data.scissor_y2 != regs.scissor_test.y2) {
1246
1247 uniform_block_data.data.scissor_x1 = regs.scissor_test.x1;
1248 uniform_block_data.data.scissor_y1 = regs.scissor_test.y1;
1249 uniform_block_data.data.scissor_x2 = regs.scissor_test.x2;
1250 uniform_block_data.data.scissor_y2 = regs.scissor_test.y2;
1251 uniform_block_data.dirty = true;
1252 }
1253}
1254
1255void RasterizerOpenGL::SyncCombinerColor() { 1255void RasterizerOpenGL::SyncCombinerColor() {
1256 auto combiner_color = PicaToGL::ColorRGBA8(Pica::g_state.regs.tev_combiner_buffer_color.raw); 1256 auto combiner_color = PicaToGL::ColorRGBA8(Pica::g_state.regs.tev_combiner_buffer_color.raw);
1257 if (combiner_color != uniform_block_data.data.tev_combiner_buffer_color) { 1257 if (combiner_color != uniform_block_data.data.tev_combiner_buffer_color) {
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 24fefed1b..e1a9cb361 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -238,6 +238,7 @@ public:
238 void FlushRegion(PAddr addr, u32 size) override; 238 void FlushRegion(PAddr addr, u32 size) override;
239 void FlushAndInvalidateRegion(PAddr addr, u32 size) override; 239 void FlushAndInvalidateRegion(PAddr addr, u32 size) override;
240 bool AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) override; 240 bool AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) override;
241 bool AccelerateTextureCopy(const GPU::Regs::DisplayTransferConfig& config) override;
241 bool AccelerateFill(const GPU::Regs::MemoryFillConfig& config) override; 242 bool AccelerateFill(const GPU::Regs::MemoryFillConfig& config) override;
242 bool AccelerateDisplay(const GPU::Regs::FramebufferConfig& config, PAddr framebuffer_addr, 243 bool AccelerateDisplay(const GPU::Regs::FramebufferConfig& config, PAddr framebuffer_addr,
243 u32 pixel_stride, ScreenInfo& screen_info) override; 244 u32 pixel_stride, ScreenInfo& screen_info) override;
@@ -393,9 +394,6 @@ private:
393 /// Syncs the depth test states to match the PICA register 394 /// Syncs the depth test states to match the PICA register
394 void SyncDepthTest(); 395 void SyncDepthTest();
395 396
396 /// Syncs the scissor test state to match the PICA register
397 void SyncScissorTest();
398
399 /// Syncs the TEV combiner color buffer to match the PICA register 397 /// Syncs the TEV combiner color buffer to match the PICA register
400 void SyncCombinerColor(); 398 void SyncCombinerColor();
401 399
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index 1808ee0a9..8f278722d 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -645,11 +645,10 @@ vec4 secondary_fragment_color = vec4(0.0);
645 // Negate the condition if we have to keep only the pixels outside the scissor box 645 // Negate the condition if we have to keep only the pixels outside the scissor box
646 if (state.scissor_test_mode == Regs::ScissorMode::Include) 646 if (state.scissor_test_mode == Regs::ScissorMode::Include)
647 out += "!"; 647 out += "!";
648 // x2,y2 have +1 added to cover the entire pixel area 648 out += "(gl_FragCoord.x >= scissor_x1 && "
649 out += "(gl_FragCoord.x >= scissor_x1 * framebuffer_scale.x && " 649 "gl_FragCoord.y >= scissor_y1 && "
650 "gl_FragCoord.y >= scissor_y1 * framebuffer_scale.y && " 650 "gl_FragCoord.x < scissor_x2 && "
651 "gl_FragCoord.x < (scissor_x2 + 1) * framebuffer_scale.x && " 651 "gl_FragCoord.y < scissor_y2)) discard;\n";
652 "gl_FragCoord.y < (scissor_y2 + 1) * framebuffer_scale.y)) discard;\n";
653 } 652 }
654 653
655 out += "float z_over_w = 1.0 - gl_FragCoord.z * 2.0;\n"; 654 out += "float z_over_w = 1.0 - gl_FragCoord.z * 2.0;\n";
HIC SVNT DRACONES