xbox fixes

WickedEngine/wiGraphicsDevice_DX12.cpp

@@ -3045,6 +3045,7 @@ std::mutex queue_locker;
 		for (uint32_t i = 0; i < swapchain->desc.buffer_count; ++i)
 		{
 			dx12_check(device->CreateCommittedResource(
+				&heap_properties,
 				D3D12_HEAP_FLAG_ALLOW_DISPLAY,
 				&resource_desc,
 				D3D12_RESOURCE_STATE_PRESENT,
@@ -3052,7 +3053,6 @@ std::mutex queue_locker;
 				PPV_ARGS(internal_state->backBuffers[i])
 			));
 
-
 			dx12_check(internal_state->backBuffers[i]->SetName(L"BackBufferXBOX"));
 
 			internal_state->backbufferRTV[i] = allocationhandler->descriptors_rtv.allocate();

WickedEngine/wiHelper.cpp

@@ -23,21 +23,22 @@
 #include <iostream>
 #include <cstdlib>
 
-#ifdef PLATFORM_LINUX
-#include <sys/sysinfo.h>
-#endif
-
 #if defined(_WIN32)
 #include <direct.h>
 #include <Psapi.h> // GetProcessMemoryInfo
 #include <Commdlg.h> // openfile
 #include <WinBase.h>
-#include <comdef.h> // com_error
-#elif defined(PLATFORM_PS5)
-#else
-#include "Utility/portable-file-dialogs.h"
 #endif // _WIN32
 
+#ifdef PLATFORM_LINUX
+#include <sys/sysinfo.h>
+#include "Utility/portable-file-dialogs.h"
+#endif // PLATFORM_LINUX
+
+#ifdef PLATFORM_WINDOWS_DESKTOP
+#include <comdef.h> // com_error
+#endif // PLATFORM_WINDOWS_DESKTOP
+
 namespace wi::helper
 {
 
@@ -1573,7 +1574,7 @@ namespace wi::helper
 	{
 		std::string str;
 
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS_DESKTOP
 		_com_error err(code);
 		LPCTSTR errMsg = err.ErrorMessage();
 		wchar_t wtext[1024] = {};
@@ -1583,6 +1584,12 @@ namespace wi::helper
 		str = text;
 #endif // _WIN32
 
+#ifdef PLATFORM_XBOX
+		char text[1024] = {};
+		snprintf(text, arraysize(text), "HRESULT error: 0x%08x", code);
+		str = text;
+#endif // PLATFORM_XBOX
+
 		return str;
 	}
 

WickedEngine/wiInput.cpp

@@ -45,7 +45,7 @@ namespace wi::input
 	CURSOR cursor_current = CURSOR_COUNT; // something that's not default, because at least once code should change it to default
 	CURSOR cursor_next = CURSOR_DEFAULT;
 
-#ifdef PLATFORM_WINDOWS_DESKTOP
+#ifdef _WIN32
 	static const HCURSOR cursor_table_original[] = {
 		::LoadCursor(nullptr, IDC_ARROW),
 		::LoadCursor(nullptr, IDC_IBEAM),
@@ -59,7 +59,7 @@ namespace wi::input
 		::LoadCursor(nullptr, IDC_CROSS),
 	};
 	static HCURSOR cursor_table[arraysize(cursor_table_original)] = {};
-#endif // PLATFORM_WINDOWS_DESKTOP
+#endif // _WIN32
 
 #ifdef SDL2
 	static SDL_Cursor* cursor_table_original[] = {

WickedEngine/wiVersion.cpp

@@ -9,7 +9,7 @@ namespace wi::version
 	// minor features, major updates, breaking compatibility changes
 	const int minor = 71;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 657;
+	const int revision = 658;
 
 	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);
 
@@ -50,7 +50,7 @@ All contributors: https://github.com/turanszkij/WickedEngine/graphs/contributors
 
 Patreon supporters
 ---------------------------
-Nemerle, James Webb, Quifeng Jin, TheGameCreators, Joseph Goldin, Yuri, Sergey K, Yukawa Kanta, Dragon Josh, John, LurkingNinja, Bernardo Del Castillo, Invictus, Scott Hunt, Yazan Altaki, Tuan NV, Robert MacGregor, cybernescence, Alexander Dahlin, blueapples, Delhills, NI NI, Sherief, ktopoet, Justin Macklin, Cédric Fabre, TogetherTeam, Bartosz Boczula, Arne Koenig, Ivan Trajchev, nathants, Fahd Ahmed, Gabriel Jadderson, SAS_Controller, Dominik Madarász, Segfault, Mike amanfo, Dennis Brakhane, rookie, Peter Moore, therealjtgill, Nicolas Embleton, Desuuc, radino1977, Anthony Curtis, manni heck, Matthias Hölzl, Phyffer, Lucas Pinheiro, Tapkaara, gpman, Anthony Python, Gnowos, Klaus, slaughternaut, Paul Brain, Connor Greaves, Alexandr, Lee Bamber, MCAlarm MC2, Titoutan, Willow, Aldo, lokimx, K. Osterman, Nomad, ykl, Alex Krokos, Timmy, Avaflow, mat, Hexegonel Samael Michael, Joe Spataro, soru, GeniokV, Mammoth, Ignacio, datae, Jason Rice, MarsBEKET, Tim, Twisty, Zelf ieats kiezen, Romildo Franco, zNachoh, Dmitriy, Alex Minerva, Stefan Kent, Natty, Sunny Krishna, Vilmos Malárik, Ferrata, Rossakis, Stefana Andrei, Taylor, Gunnar Kriik, 赟 杨, Rex, Lemon Brother
+Nemerle, James Webb, Quifeng Jin, TheGameCreators, Joseph Goldin, Yuri, Sergey K, Yukawa Kanta, Dragon Josh, John, LurkingNinja, Bernardo Del Castillo, Invictus, Scott Hunt, Yazan Altaki, Tuan NV, Robert MacGregor, cybernescence, Alexander Dahlin, blueapples, Delhills, NI NI, Sherief, ktopoet, Justin Macklin, Cédric Fabre, TogetherTeam, Bartosz Boczula, Arne Koenig, Ivan Trajchev, nathants, Fahd Ahmed, Gabriel Jadderson, SAS_Controller, Dominik Madarász, Segfault, Mike amanfo, Dennis Brakhane, rookie, Peter Moore, therealjtgill, Nicolas Embleton, Desuuc, radino1977, Anthony Curtis, manni heck, Matthias Hölzl, Phyffer, Lucas Pinheiro, Tapkaara, gpman, Anthony Python, Gnowos, Klaus, slaughternaut, Paul Brain, Connor Greaves, Alexandr, Lee Bamber, MCAlarm MC2, Titoutan, Willow, Aldo, lokimx, K. Osterman, Nomad, ykl, Alex Krokos, Timmy, Avaflow, mat, Hexegonel Samael Michael, Joe Spataro, soru, GeniokV, Mammoth, Ignacio, datae, Jason Rice, MarsBEKET, Tim, Twisty, Zelf ieats kiezen, Romildo Franco, zNachoh, Dmitriy, Alex Minerva, Stefan Kent, Natty, Sunny Krishna, Vilmos Malárik, Ferrata, Rossakis, Stefana Andrei, Taylor, Gunnar Kriik, 赟 杨, Rex, Lemon Brother, fixy, meta_leap
 		)";
 
 		return credits;