dolphin-emu/archived-hwtests
1
0
Fork 0
mirror of https://github.com/dolphin-emu/hwtests.git synced 2026-01-31 01:05:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

CMakeLists: Specify C++17

Browse Source 
WriteMtxPS4x2 has been removed since register is no longer a keyword.  It wasn't used in any case.  I've also enabled additional warnings (though I haven't fixed any of them).
This commit is contained in:
Pokechu22
2021-12-04 18:23:14 -08:00
parent 205f245112
commit ec7e2166b2
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -9,13 +9,13 @@ link_directories(${DEVKITPRO}/libogc/lib/wii)
set(MACHDEP "-DGEKKO -mrvl -mcpu=750 -meabi -mhard-float")
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_ASM_FLAGS "-x assembler-with-cpp")
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${MACHDEP}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MACHDEP} -fdiagnostics-color")
set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-function -O2 ${CMAKE_CXX_FLAGS} ${MACHDEP}")
set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-function -O2 ${CMAKE_CXX_FLAGS} ${MACHDEP} -fdiagnostics-color")
set(CMAKE_EXECUTABLE_SUFFIX ".elf")
add_custom_target(run)

18
gxtest/cgx.cpp
View File

@@ -93,24 +93,6 @@ void CGX_SetViewport(float origin_x, float origin_y, float width, float height,
wgPipe->F32 = far * 16777215.0f;
}
static inline void WriteMtxPS4x2(register f32 mt[3][4], register void* wgpipe)
{
// Untested
register f32 tmp0, tmp1, tmp2, tmp3;
__asm__ __volatile__("psq_l %0,0(%4),0,0\n\
psq_l %1,8(%4),0,0\n\
psq_l %2,16(%4),0,0\n\
psq_l %3,24(%4),0,0\n\
psq_st %0,0(%5),0,0\n\
psq_st %1,0(%5),0,0\n\
psq_st %2,0(%5),0,0\n\
psq_st %3,0(%5),0,0"
: "=&f"(tmp0), "=&f"(tmp1), "=&f"(tmp2), "=&f"(tmp3)
: "b"(mt), "b"(wgpipe)
: "memory");
}
void CGX_LoadPosMatrixDirect(f32 mt[3][4], u32 index)
{
// Untested