Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-09 23:58:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Fixed error check in glTexImage2D definition

Browse Source
This commit is contained in:
korenkonder
2025-09-28 18:15:11 +03:00
parent 41aeea3339
commit cae89c4fd4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/Vulkan/gl_wrap.cpp
+10 -4
View File
@@ -1704,15 +1704,20 @@ namespace Vulkan {
return VK_FORMAT_R8_UNORM;
case GL_RGB5:
return VK_FORMAT_R5G6B5_UNORM_PACK16;
case GL_RGB8:
return VK_FORMAT_R8G8B8A8_UNORM;
case GL_RGBA4:
return VK_FORMAT_R4G4B4A4_UNORM_PACK16;
case GL_RGB5_A1:
return VK_FORMAT_R5G5B5A1_UNORM_PACK16;
case GL_RGB8:
case GL_RGBA8:
return VK_FORMAT_R8G8B8A8_UNORM;
case GL_DEPTH_COMPONENT16:
return VK_FORMAT_D16_UNORM;
case GL_DEPTH_COMPONENT24:
return VK_FORMAT_D24_UNORM_S8_UINT;
case GL_DEPTH_COMPONENT32:
return VK_FORMAT_D32_SFLOAT;
case GL_R8:
return VK_FORMAT_R8_UNORM;
case GL_RG8:
@@ -6593,7 +6598,6 @@ namespace Vulkan {
case GL_DEPTH_COMPONENT32F:
break;
default:
printf("e");
gl_wrap_manager_ptr->push_error(GL_INVALID_ENUM);
return;
}
@@ -6602,8 +6606,10 @@ namespace Vulkan {
|| (type == GL_UNSIGNED_SHORT_4_4_4_4_REV || type == GL_UNSIGNED_SHORT_1_5_5_5_REV
|| type == GL_UNSIGNED_INT_5_9_9_9_REV) && format != GL_RGBA
|| ((target != GL_TEXTURE_2D || format != GL_DEPTH_COMPONENT || pixels)
&& internal_format == GL_DEPTH_COMPONENT16 && internal_format != GL_DEPTH_COMPONENT24
&& internal_format == GL_DEPTH24_STENCIL8 && internal_format== GL_DEPTH_COMPONENT32F)) {
&& (internal_format == GL_DEPTH_COMPONENT16 || internal_format == GL_DEPTH_COMPONENT24
|| internal_format == GL_DEPTH_COMPONENT32 || internal_format == GL_DEPTH_COMPONENT32F))
|| ((target != GL_TEXTURE_2D || format != GL_DEPTH_STENCIL || pixels)
&& (internal_format == GL_DEPTH24_STENCIL8))) {
gl_wrap_manager_ptr->push_error(GL_INVALID_OPERATION);
return;
}