smaller fixes
This commit is contained in:
5
external/parallel-rdp/ParallelRDPWrapper.cpp
vendored
5
external/parallel-rdp/ParallelRDPWrapper.cpp
vendored
@@ -184,11 +184,6 @@ void LoadParallelRDP(const u8* rdram) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InitParallelRDP(const u8* rdram, SDL_Window* window) {
|
|
||||||
LoadWSIPlatform(new SDLWSIPlatform(window), std::make_unique<SDLParallelRdpWindowInfo>(window));
|
|
||||||
LoadParallelRDP(rdram);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DrawFullscreenTexturedQuad(Util::IntrusivePtr<Image> image, Util::IntrusivePtr<CommandBuffer> cmd) {
|
void DrawFullscreenTexturedQuad(Util::IntrusivePtr<Image> image, Util::IntrusivePtr<CommandBuffer> cmd) {
|
||||||
cmd->set_texture(0, 0, image->get_view(), Vulkan::StockSampler::LinearClamp);
|
cmd->set_texture(0, 0, image->get_view(), Vulkan::StockSampler::LinearClamp);
|
||||||
cmd->set_program(fullscreen_quad_program);
|
cmd->set_program(fullscreen_quad_program);
|
||||||
|
|||||||
3
external/parallel-rdp/ParallelRDPWrapper.hpp
vendored
3
external/parallel-rdp/ParallelRDPWrapper.hpp
vendored
@@ -32,7 +32,8 @@ uint32_t GetVkGraphicsQueueFamily();
|
|||||||
VkFormat GetVkFormat();
|
VkFormat GetVkFormat();
|
||||||
VkCommandBuffer GetVkCommandBuffer();
|
VkCommandBuffer GetVkCommandBuffer();
|
||||||
void SubmitRequestedVkCommandBuffer();
|
void SubmitRequestedVkCommandBuffer();
|
||||||
void InitParallelRDP(const u8* rdram, SDL_Window* window);
|
void LoadParallelRDP(const u8* rdram);
|
||||||
|
Vulkan::WSI* LoadWSIPlatform(Vulkan::WSIPlatform* wsi_platform, std::unique_ptr<ParallelRdpWindowInfo>&& newWindowInfo);
|
||||||
void UpdateScreenParallelRdp(n64::Core& core, n64::VI& vi);
|
void UpdateScreenParallelRdp(n64::Core& core, n64::VI& vi);
|
||||||
void ParallelRdpEnqueueCommand(int command_length, u32* buffer);
|
void ParallelRdpEnqueueCommand(int command_length, u32* buffer);
|
||||||
void ParallelRdpOnFullSync();
|
void ParallelRdpOnFullSync();
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#include <Core.hpp>
|
#include <Core.hpp>
|
||||||
#include <Scheduler.hpp>
|
#include <Scheduler.hpp>
|
||||||
|
#include <ParallelRDPWrapper.hpp>
|
||||||
|
|
||||||
namespace n64 {
|
namespace n64 {
|
||||||
u32 extraCycles = 0;
|
u32 extraCycles = 0;
|
||||||
|
|||||||
@@ -153,6 +153,8 @@ void Mem::LoadROM(bool isArchive, const std::string& filename) {
|
|||||||
memcpy(&rom.header, buf, sizeof(ROMHeader));
|
memcpy(&rom.header, buf, sizeof(ROMHeader));
|
||||||
memcpy(rom.gameNameCart, rom.header.imageName, sizeof(rom.header.imageName));
|
memcpy(rom.gameNameCart, rom.header.imageName, sizeof(rom.header.imageName));
|
||||||
|
|
||||||
|
free(buf);
|
||||||
|
|
||||||
rom.header.clockRate = be32toh(rom.header.clockRate);
|
rom.header.clockRate = be32toh(rom.header.clockRate);
|
||||||
rom.header.programCounter = be32toh(rom.header.programCounter);
|
rom.header.programCounter = be32toh(rom.header.programCounter);
|
||||||
rom.header.release = be32toh(rom.header.release);
|
rom.header.release = be32toh(rom.header.release);
|
||||||
|
|||||||
@@ -25,4 +25,5 @@ void KaizenQt::ConnectMainWindowSignalsToSlots() noexcept
|
|||||||
void KaizenQt::LoadROM(const QString& file_name) noexcept
|
void KaizenQt::LoadROM(const QString& file_name) noexcept
|
||||||
{
|
{
|
||||||
emuThread->core.LoadROM(file_name.toStdString());
|
emuThread->core.LoadROM(file_name.toStdString());
|
||||||
|
emuThread->start();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user