Replace spirv-helper stuff with a library that combines everything
This commit is contained in:
@@ -4,3 +4,7 @@ project(core-tests)
|
||||
|
||||
add_executable(core-tests ${CMAKE_CURRENT_SOURCE_DIR}/source/main.cpp)
|
||||
target_link_libraries(core-tests PRIVATE palladium::palladium)
|
||||
|
||||
install(
|
||||
TARGETS core-tests
|
||||
)
|
||||
@@ -8,3 +8,7 @@ target_link_libraries(gfx-tests PRIVATE palladium::palladium pd-system stb)
|
||||
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
||||
target_link_libraries(gfx-tests PRIVATE glfw)
|
||||
endif()
|
||||
|
||||
install(
|
||||
TARGETS gfx-tests
|
||||
)
|
||||
@@ -50,12 +50,19 @@ class App {
|
||||
if (d == Driver::OpenGL2) {
|
||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
|
||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
|
||||
#ifdef __APPLE__
|
||||
glfwWindowHint(GLFW_COCOA_RETINA_FRAMEBUFFER, 0);
|
||||
#endif
|
||||
PD::Gfx::UseDriver<PD::GfxOpenGL2>();
|
||||
winname += " (OpenGL2)";
|
||||
} else if (d == Driver::OpenGL3) {
|
||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
|
||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
|
||||
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
||||
#ifdef __APPLE__
|
||||
glfwWindowHint(GLFW_COCOA_RETINA_FRAMEBUFFER, 0);
|
||||
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, 1);
|
||||
#endif
|
||||
PD::Gfx::UseDriver<PD::GfxOpenGL3>();
|
||||
winname += " (OpenGL3)";
|
||||
} else if (d == Driver::DirectX9) {
|
||||
@@ -142,11 +149,13 @@ class App {
|
||||
C3D_RenderTargetClear(Top, C3D_CLEAR_ALL, PD::Color(25, 25, 25, 25), 0);
|
||||
#else
|
||||
while (!glfwWindowShouldClose(window)) {
|
||||
PD::Gfx::SetViewPort(1280, 720);
|
||||
int ww, wh;
|
||||
glfwGetFramebufferSize(window, &ww, &wh);
|
||||
PD::Gfx::SetViewPort(ww, wh);
|
||||
if (pDriver == Driver::OpenGL2 || pDriver == Driver::OpenGL3) {
|
||||
glClearColor(0.1, 0.1, 0.1, 0.1);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
glViewport(0, 0, 1280, 720);
|
||||
glViewport(0, 0, ww, wh);
|
||||
} else if (pDriver == Driver::DirectX9) {
|
||||
#ifdef _WIN32
|
||||
if (dx9_device) {
|
||||
|
||||
Reference in New Issue
Block a user