redstrate/prism
Archived
1
Fork 0
Code Activity

Appease MSVC

Browse source
This commit is contained in:
Joshua Goins 2022-03-04 19:17:07 -05:00
parent f87143eb13
commit 33680efe7b
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/core/src/engine.cpp
View file

@ -84,7 +84,7 @@ void engine::set_app(prism::app* p_app) {
this->current_app = p_app; this->current_app = p_app;
if(platform::supports_feature(PlatformFeature::Windowing) && ::engine->get_app()->is_multimodal()) { if(platform::supports_feature(PlatformFeature::Windowing) && get_app()->is_multimodal()) {
ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
} }
@ -427,7 +427,7 @@ void engine::add_window(void* native_handle, const platform::window_ptr window_p
current_renderer = std::make_unique<prism::renderer>(gfx); current_renderer = std::make_unique<prism::renderer>(gfx);
ImGuiViewport* main_viewport = ImGui::GetMainViewport(); ImGuiViewport* main_viewport = ImGui::GetMainViewport();
main_viewport->PlatformHandle = ::engine->get_main_window(); main_viewport->PlatformHandle = get_main_window();
} }
const auto drawable_extent = platform::get_window_drawable_size(window_ptr); const auto drawable_extent = platform::get_window_drawable_size(window_ptr);

1
engine/gfx/dx12/src/gfx_dx12.cpp
View file

@ -5,6 +5,7 @@
#include <d3dcompiler.h> #include <d3dcompiler.h>
#include <wrl.h> #include <wrl.h>
#include <codecvt>
// from https://stackoverflow.com/a/18374698 // from https://stackoverflow.com/a/18374698
std::string ws2s(const std::wstring& wstr) { std::string ws2s(const std::wstring& wstr) {

2
platforms/sdl/main.cpp.in
View file

@ -34,7 +34,7 @@ std::vector<SDL_Window*> windows;
std::map<SDL_Window*, SDL_Renderer*> renderers; std::map<SDL_Window*, SDL_Renderer*> renderers;
SDL_Window* main_window = nullptr; SDL_Window* main_window = nullptr;
SDL_Window* get_window(const platform::window_ptr index) { extern "C" SDL_Window* get_window(const platform::window_ptr index) {
for(auto& window : windows) { for(auto& window : windows) {
if(window == index) if(window == index)
return window; return window;

2
platforms/sdl/sdl_metal.mm
View file

@ -10,7 +10,7 @@
extern std::vector<SDL_Window*> windows; extern std::vector<SDL_Window*> windows;
extern std::map<SDL_Window*, SDL_Renderer*> renderers; extern std::map<SDL_Window*, SDL_Renderer*> renderers;
SDL_Window* get_window(platform::window_ptr index); extern "C" SDL_Window* get_window(platform::window_ptr index);
CAMetalLayer* get_layer(platform::window_ptr index) { CAMetalLayer* get_layer(platform::window_ptr index) {
return (__bridge CAMetalLayer*)SDL_RenderGetMetalLayer(renderers[get_window(index)]); return (__bridge CAMetalLayer*)SDL_RenderGetMetalLayer(renderers[get_window(index)]);
} }

2
platforms/sdl/sdl_vulkan.cpp
View file

@ -5,7 +5,7 @@
extern std::vector<SDL_Window*> windows; extern std::vector<SDL_Window*> windows;
SDL_Window* get_window(platform::window_ptr index); extern "C" SDL_Window* get_window(platform::window_ptr index);
void* create_vulkan_surface(platform::window_ptr window, void* surface_creation_info) { void* create_vulkan_surface(platform::window_ptr window, void* surface_creation_info) {
auto vulkan_surface_info = (vulkan_surface_creation_info*)surface_creation_info; auto vulkan_surface_info = (vulkan_surface_creation_info*)surface_creation_info;