- backend fixes from GZDoom.

ZDoom · Apr 25, 2021 · dca9644 · dca9644
1 parent 3ad4a86
commit dca9644
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/source/common/console/c_bind.cpp b/source/common/console/c_bind.cpp
@@ -460,6 +460,11 @@ int FKeyBindings::GetKeysForCommand (const char *cmd, int *first, int *second)
 
 	*first = *second = c = i = 0;
 
+	if (cmd[0] == '\0')
+	{
+		return 0;
+	}
+
 	while (i < NUM_KEYS && c < 2)
 	{
 		if (stricmp (cmd, Binds[i]) == 0)

diff --git a/source/common/filesystem/filesystem.cpp b/source/common/filesystem/filesystem.cpp
@@ -1534,7 +1534,6 @@ bool FileSystem::CreatePathlessCopy(const char *name, int id, int /*flags*/)
 
 	auto oldlump = FileInfo[lump];
 	int slash = oldlump.longName.LastIndexOf('/');
-	// Note: already pathless entries must be duplica
 
 	if (slash == -1)
 	{

diff --git a/source/common/rendering/vulkan/textures/vk_hwtexture.cpp b/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
@@ -270,7 +270,9 @@ uint8_t *VkHardwareTexture::MapBuffer()
 
 unsigned int VkHardwareTexture::CreateTexture(unsigned char * buffer, int w, int h, int texunit, bool mipmap, const char *name)
 {
-	CreateTexture(w, h, mTexelsize, mTexelsize == 4 ? VK_FORMAT_B8G8R8A8_UNORM : VK_FORMAT_R8_UNORM, buffer, mipmap);
+	// CreateTexture is used by the software renderer to create a screen output but without any screen data.
+	if (buffer)
+		CreateTexture(w, h, mTexelsize, mTexelsize == 4 ? VK_FORMAT_B8G8R8A8_UNORM : VK_FORMAT_R8_UNORM, buffer, mipmap);
 	return 0;
 }