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

vulkan and imgui fixes

Browse Source
This commit is contained in:
CocoSimone
2022-08-11 14:43:59 +02:00
parent d41581b644
commit 402062920e
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/imgui/CMakeLists.txt vendored
View File

@@ -18,3 +18,4 @@ add_library(imgui
imgui/backends/imgui_impl_vulkan.cpp) imgui/backends/imgui_impl_vulkan.cpp)
target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends) target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends)
#target_compile_definitions(imgui PRIVATE VK_NO_PROTOTYPES)

1
external/parallel-rdp/ParallelRDPWrapper.hpp vendored
View File

@@ -1,4 +1,5 @@
#pragma once #pragma once
#define VULKAN_DEBUG
#include <Core.hpp> #include <Core.hpp>
#include <wsi.hpp> #include <wsi.hpp>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>

3
src/frontend/imgui/Window.cpp
View File

@@ -22,7 +22,7 @@ void Window::InitSDL() {
"natsukashii", "natsukashii",
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
1280, 720, 800, 600,
SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI
); );
@@ -155,6 +155,7 @@ void Window::InitImgui() {
//io.Fonts->AddFontFromFileTTF("../../misc/fonts/ProggyTiny.ttf", 10.0f); //io.Fonts->AddFontFromFileTTF("../../misc/fonts/ProggyTiny.ttf", 10.0f);
//ImFont* font = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, NULL, io.Fonts->GetGlyphRangesJapanese()); //ImFont* font = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, NULL, io.Fonts->GetGlyphRangesJapanese());
//IM_ASSERT(font != NULL); //IM_ASSERT(font != NULL);
io.Fonts->AddFontDefault();
// Upload Fonts // Upload Fonts
{ {