diff options
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 3 | ||||
| -rw-r--r-- | src/core/hle/service/nwm_uds.h | 2 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 11 | ||||
| -rw-r--r-- | src/video_core/pica.h | 2 |
6 files changed, 17 insertions, 7 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 4c940bcb..1e439db9 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -87,7 +87,7 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { } void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) { - Kernel::SetupMainThread(stack_size, entry_point, main_thread_priority); + Kernel::SetupMainThread(entry_point, main_thread_priority); } Kernel::Process::Process() {} diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 56ded72c..ab69a426 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -460,12 +460,12 @@ SharedPtr<Thread> SetupIdleThread() { return thread; } -SharedPtr<Thread> SetupMainThread(u32 stack_size, u32 entry_point, s32 priority) { +SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority) { DEBUG_ASSERT(!GetCurrentThread()); // Initialize new "main" thread auto thread_res = Thread::Create("main", entry_point, priority, 0, - THREADPROCESSORID_0, Memory::HEAP_VADDR_END - stack_size); + THREADPROCESSORID_0, Memory::HEAP_VADDR_END); SharedPtr<Thread> thread = thread_res.MoveFrom(); diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index c5f4043c..1d4d010f 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -183,12 +183,11 @@ private: /** * Sets up the primary application thread - * @param stack_size The size of the thread's stack * @param entry_point The address at which the thread should start execution * @param priority The priority to give the main thread * @return A shared pointer to the main thread */ -SharedPtr<Thread> SetupMainThread(u32 stack_size, u32 entry_point, s32 priority); +SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority); /** * Reschedules to the next available thread (call after current thread is suspended) diff --git a/src/core/hle/service/nwm_uds.h b/src/core/hle/service/nwm_uds.h index 9043f5aa..82abdff2 100644 --- a/src/core/hle/service/nwm_uds.h +++ b/src/core/hle/service/nwm_uds.h @@ -18,7 +18,7 @@ public: Interface(); std::string GetPortName() const override { - return "nwm:UDS"; + return "nwm::UDS"; } }; diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 2d9d8ab1..883df48a 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -393,6 +393,17 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture } } + case Regs::TextureFormat::I4: + { + u32 morton_offset = VideoCore::GetMortonOffset(x, y, 1); + const u8* source_ptr = source + morton_offset / 2; + + u8 i = (morton_offset % 2) ? ((*source_ptr & 0xF0) >> 4) : (*source_ptr & 0xF); + i = Color::Convert4To8(i); + + return { i, i, i, 255 }; + } + case Regs::TextureFormat::A4: { u32 morton_offset = VideoCore::GetMortonOffset(x, y, 1); diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 5e169ff6..a5342971 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -156,7 +156,7 @@ struct Regs { I8 = 7, A8 = 8, IA4 = 9, - + I4 = 10, A4 = 11, ETC1 = 12, // compressed ETC1A4 = 13, // compressed |