Fix GL Scissor in Desktop Backend
This commit is contained in:
@@ -74,6 +74,21 @@ endif()
|
|||||||
|
|
||||||
target_include_directories(palladium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
target_include_directories(palladium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
||||||
|
target_compile_options(palladium PRIVATE
|
||||||
|
$<$<COMPILE_LANGUAGE:C>:-Wall>
|
||||||
|
$<$<COMPILE_LANGUAGE:C>:-Wno-psabi>
|
||||||
|
$<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
|
||||||
|
target_compile_options(palladium PRIVATE
|
||||||
|
$<$<CONFIG:Debug>:-O0 -g>
|
||||||
|
$<$<CONFIG:Release>:-O3>
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
install(DIRECTORY include DESTINATION ".")
|
install(DIRECTORY include DESTINATION ".")
|
||||||
install(TARGETS palladium)
|
install(TARGETS palladium)
|
||||||
|
|
||||||
|
|||||||
@@ -309,6 +309,7 @@ void GfxGL2::RenderDrawData(const Li::CmdPool& Commands) {
|
|||||||
#if PD_OPENGL >= 33
|
#if PD_OPENGL >= 33
|
||||||
glBindVertexArray(0);
|
glBindVertexArray(0);
|
||||||
#endif
|
#endif
|
||||||
|
glDisable(GL_SCISSOR_TEST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,11 +11,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
|||||||
if(${PD_BUILD_SHARED})
|
if(${PD_BUILD_SHARED})
|
||||||
message(ERROR "3DS Only supports Static libraries")
|
message(ERROR "3DS Only supports Static libraries")
|
||||||
endif()
|
endif()
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-psabi -O2")
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(../ palladium)
|
add_subdirectory(../ palladium)
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
||||||
add_subdirectory(../backends/3ds pd-3ds)
|
add_subdirectory(../backends/3ds pd-3ds)
|
||||||
else()
|
else()
|
||||||
@@ -24,17 +23,33 @@ endif()
|
|||||||
|
|
||||||
add_executable(test source/main.cpp
|
add_executable(test source/main.cpp
|
||||||
${BKND_SRC})
|
${BKND_SRC})
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
||||||
target_link_libraries(test PUBLIC pd-3ds palladium)
|
target_link_libraries(test PUBLIC pd-3ds palladium)
|
||||||
else()
|
else()
|
||||||
target_link_libraries(test PUBLIC pd-desktop palladium)
|
target_link_libraries(test PUBLIC pd-desktop palladium)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#set(RC_FILES
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
||||||
#testassets/ComicNeue.ttf
|
target_compile_options(palladium PRIVATE
|
||||||
#testassets/logo.png
|
$<$<COMPILE_LANGUAGE:C>:-Wall>
|
||||||
#testassets/test.png)
|
$<$<COMPILE_LANGUAGE:C>:-Wno-psabi>
|
||||||
#install(FILES ${RC_FILES} DESTINATION ".")
|
$<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
|
||||||
#else()
|
)
|
||||||
#target_link_libraries(test PUBLIC pd-backend-3ds ctru citro3d)
|
endif()
|
||||||
#endif()
|
|
||||||
|
if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
|
||||||
|
target_compile_options(palladium PRIVATE
|
||||||
|
$<$<CONFIG:Debug>:-O0 -g>
|
||||||
|
$<$<CONFIG:Release>:-O3>
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# set(RC_FILES
|
||||||
|
# testassets/ComicNeue.ttf
|
||||||
|
# testassets/logo.png
|
||||||
|
# testassets/test.png)
|
||||||
|
# install(FILES ${RC_FILES} DESTINATION ".")
|
||||||
|
# else()
|
||||||
|
# target_link_libraries(test PUBLIC pd-backend-3ds ctru citro3d)
|
||||||
|
# endif()
|
||||||
Reference in New Issue
Block a user