diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index b998f3bb6..aa6cefca3 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -656,7 +656,6 @@ void EditorComponent::Load()
exitButton->SetColor(wiColor(190, 0, 0, 200), wiWidget::WIDGETSTATE::IDLE);
exitButton->SetColor(wiColor(255, 0, 0, 255), wiWidget::WIDGETSTATE::FOCUS);
exitButton->OnClick([](wiEventArgs args) {
- wiRenderer::GetDevice()->WaitForGPU();
exit(0);
});
GetGUI().AddWidget(exitButton);
diff --git a/Editor/Editor.vcxproj b/Editor/Editor.vcxproj
index a739d7441..efdf1602d 100644
--- a/Editor/Editor.vcxproj
+++ b/Editor/Editor.vcxproj
@@ -98,12 +98,12 @@
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
Windows
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories)
@@ -112,12 +112,12 @@
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
Windows
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories)
@@ -128,7 +128,7 @@
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
MultiThreaded
StreamingSIMDExtensions2
Fast
@@ -141,7 +141,7 @@
true
true
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories)
@@ -152,7 +152,7 @@
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
true
MultiThreaded
@@ -161,7 +161,7 @@
true
true
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories)
diff --git a/Template_Windows/Template_Windows.vcxproj b/Template_Windows/Template_Windows.vcxproj
index 977862dd2..eb43a752e 100644
--- a/Template_Windows/Template_Windows.vcxproj
+++ b/Template_Windows/Template_Windows.vcxproj
@@ -97,7 +97,7 @@
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
MultiThreaded
@@ -105,7 +105,7 @@
true
true
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories)
@@ -115,12 +115,12 @@
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
Windows
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories)
@@ -130,12 +130,12 @@
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
Windows
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories)
@@ -147,7 +147,7 @@
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
MultiThreaded
@@ -155,7 +155,7 @@
true
true
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories)
diff --git a/Tests/Tests.vcxproj b/Tests/Tests.vcxproj
index 83240cd84..644133d11 100644
--- a/Tests/Tests.vcxproj
+++ b/Tests/Tests.vcxproj
@@ -102,7 +102,7 @@
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
MultiThreaded
@@ -110,7 +110,7 @@
true
true
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories)
@@ -120,13 +120,13 @@
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
MultiThreadedDebugDLL
Windows
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories)
@@ -136,13 +136,13 @@
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
MultiThreadedDebugDLL
Windows
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories)
@@ -154,7 +154,7 @@
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ../WickedEngine
+ ../WickedEngine;%(AdditionalIncludeDirectories)
MultiThreaded
@@ -162,7 +162,7 @@
true
true
true
- ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32
+ ../$(Platform)/$(Configuration);$(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories)
diff --git a/WickedEngine/RenderPath2D.cpp b/WickedEngine/RenderPath2D.cpp
index 8224df48e..db2fb2135 100644
--- a/WickedEngine/RenderPath2D.cpp
+++ b/WickedEngine/RenderPath2D.cpp
@@ -17,8 +17,6 @@ void RenderPath2D::ResizeBuffers()
GraphicsDevice* device = wiRenderer::GetDevice();
- wiRenderer::GetDevice()->WaitForGPU();
-
FORMAT defaultTextureFormat = device->GetBackBufferFormat();
if(GetDepthStencil() != nullptr && wiRenderer::GetResolutionScale() != 1.0f)
diff --git a/WickedEngine/WickedEngine_Windows.vcxproj b/WickedEngine/WickedEngine_Windows.vcxproj
index f159085a4..a78c938e8 100644
--- a/WickedEngine/WickedEngine_Windows.vcxproj
+++ b/WickedEngine/WickedEngine_Windows.vcxproj
@@ -110,7 +110,7 @@
true
- $(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories)
+ $(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
@@ -139,7 +139,7 @@
true
- $(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories)
+ $(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
@@ -166,7 +166,7 @@
shaders/%(Filename).cso
- $(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories)
+ $(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
@@ -193,7 +193,7 @@
shaders/%(Filename).cso
- $(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories)
+ $(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
diff --git a/WickedEngine/wiNetwork_Windows.cpp b/WickedEngine/wiNetwork_Windows.cpp
index 0350149e9..bf98aa00a 100644
--- a/WickedEngine/wiNetwork_Windows.cpp
+++ b/WickedEngine/wiNetwork_Windows.cpp
@@ -9,6 +9,18 @@
namespace wiNetwork
{
+ struct wiNetwork_Internal_Cleanup
+ {
+ bool initialized = false;
+ ~wiNetwork_Internal_Cleanup()
+ {
+ if (initialized)
+ {
+ WSACleanup();
+ }
+ }
+ } cleanup;
+
Socket::~Socket()
{
Destroy(this);
@@ -28,6 +40,7 @@ namespace wiNetwork
WSACleanup();
assert(0);
}
+ cleanup.initialized = true; // it will auto cleanup
wiBackLog::post("wiNetwork Initialized");
}
diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp
index b6257d4b7..2c6abbd5b 100644
--- a/WickedEngine/wiRenderer.cpp
+++ b/WickedEngine/wiRenderer.cpp
@@ -2701,8 +2701,6 @@ void Initialize()
}
void ClearWorld()
{
- GetDevice()->WaitForGPU();
-
for (wiSprite* x : waterRipples)
{
delete x;
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index a576d805a..c00c4296a 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
// minor features, major updates
const int minor = 36;
// minor bug fixes, alterations, refactors, updates
- const int revision = 6;
+ const int revision = 7;
long GetVersion()