zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-27 20:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- backend fixes from GZDoom.

Browse source
This commit is contained in:
Christoph Oelckers 2021-04-25 11:28:34 +02:00
parent 3ad4a869c1
commit dca964444b
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/common/console/c_bind.cpp
View file

@ -460,6 +460,11 @@ int FKeyBindings::GetKeysForCommand (const char *cmd, int *first, int *second)
*first = *second = c = i = 0; *first = *second = c = i = 0;
if (cmd[0] == '\0')
{
return 0;
}
while (i < NUM_KEYS && c < 2) while (i < NUM_KEYS && c < 2)
{ {
if (stricmp (cmd, Binds[i]) == 0) if (stricmp (cmd, Binds[i]) == 0)

1
source/common/filesystem/filesystem.cpp
View file

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

2
source/common/rendering/vulkan/textures/vk_hwtexture.cpp
View file

@ -270,6 +270,8 @@ uint8_t *VkHardwareTexture::MapBuffer()
unsigned int VkHardwareTexture::CreateTexture(unsigned char * buffer, int w, int h, int texunit, bool mipmap, const char *name) unsigned int VkHardwareTexture::CreateTexture(unsigned char * buffer, int w, int h, int texunit, bool mipmap, const char *name)
{ {
// 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); CreateTexture(w, h, mTexelsize, mTexelsize == 4 ? VK_FORMAT_B8G8R8A8_UNORM : VK_FORMAT_R8_UNORM, buffer, mipmap);
return 0; return 0;
} }