iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix crash in volk

Browse Source
This commit is contained in:
Simone Coco
2024-05-17 13:06:39 +02:00
parent 035916f825
commit 6336780477
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -16,7 +16,6 @@ if (HAS_SSE4_1)
add_compile_options(-msse3 -msse4.1) add_compile_options(-msse3 -msse4.1)
endif () endif ()
add_compile_definitions(SDL_MAIN_HANDLED)
if(${CMAKE_BUILD_TYPE} MATCHES Debug) if(${CMAKE_BUILD_TYPE} MATCHES Debug)
add_compile_definitions(VULKAN_DEBUG) add_compile_definitions(VULKAN_DEBUG)
#add_compile_options(-fsanitize=address -fsanitize=undefined) #add_compile_options(-fsanitize=address -fsanitize=undefined)

6
src/backend/core/mmio/Audio.hpp
View File

@@ -13,10 +13,12 @@ struct AudioDevice {
void PushSample(float, float, float, float); void PushSample(float, float, float, float);
void AdjustSampleRate(int); void AdjustSampleRate(int);
void LockMutex() { void LockMutex() {
SDL_LockMutex(audioStreamMutex); if(audioStreamMutex)
SDL_LockMutex(audioStreamMutex);
} }
void UnlockMutex() { void UnlockMutex() {
SDL_UnlockMutex(audioStreamMutex); if (audioStreamMutex)
SDL_UnlockMutex(audioStreamMutex);
} }
SDL_AudioStream* GetStream() { return audioStream; } SDL_AudioStream* GetStream() { return audioStream; }

2
src/backend/core/mmio/PI.cpp
View File

@@ -468,7 +468,7 @@ void PI::Write(u32 addr, u32 val) {
for(u32 i = 0; i < len; i++) { for(u32 i = 0; i < len; i++) {
u32 addr = BYTE_ADDRESS(dramAddrInternal + i) & RDRAM_DSIZE; u32 addr = BYTE_ADDRESS(dramAddrInternal + i) & RDRAM_DSIZE;
if (addr < mem.mmio.rdp.rdram.size()) { if (addr < RDRAM_SIZE) {
mem.mmio.rdp.rdram[addr] = BusRead<u8, true>(cartAddrInternal + i); mem.mmio.rdp.rdram[addr] = BusRead<u8, true>(cartAddrInternal + i);
} }
} }

3
src/frontend/CMakeLists.txt
View File

@@ -7,7 +7,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
find_package(SDL2 CONFIG REQUIRED) find_package(SDL2 CONFIG REQUIRED)
include_directories( include_directories(
${SDL2_INCLUDE_DIRS}
. .
../ ../
../utils ../utils
@@ -33,6 +32,7 @@ include_directories(
../../external/imgui/imgui ../../external/imgui/imgui
../../external/imgui/imgui/backends ../../external/imgui/imgui/backends
../../external/unarr ../../external/unarr
${SDL2_INCLUDE_DIRS}
) )
option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." OFF) option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." OFF)
@@ -73,6 +73,7 @@ add_executable(kaizen-qt
InputSettings.cpp) InputSettings.cpp)
target_link_libraries(kaizen-qt PUBLIC Qt6::Core Qt6::Gui Qt6::Widgets fmt mio nlohmann_json nfd parallel-rdp backend) target_link_libraries(kaizen-qt PUBLIC Qt6::Core Qt6::Gui Qt6::Widgets fmt mio nlohmann_json nfd parallel-rdp backend)
target_compile_definitions(kaizen-qt PUBLIC SDL_MAIN_HANDLED)
file(COPY ../../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/) file(COPY ../../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/)
file(REMOVE file(REMOVE