diff --git a/example/Vulkan/TextureFormat.cpp b/example/Vulkan/TextureFormat.cpp index e69de29b..4f90f5f6 100644 --- a/example/Vulkan/TextureFormat.cpp +++ b/example/Vulkan/TextureFormat.cpp @@ -0,0 +1,26 @@ +#include +#include + +VK_NAMESPACE_USING; + +int main(int,char **) +{ + #ifdef _DEBUG + if(!CheckStrideBytesByFormat()) + { + std::cerr<<"check stride bytes by format failed."< #include -#define VK_NAMESPACE hgl::graph::vulkan +#define VK_NAMESPACE hgl::graph::vulkan + +#define VK_NAMESPACE_USING using namespace VK_NAMESPACE; + #define VK_NAMESPACE_BEGIN namespace hgl{namespace graph{namespace vulkan{ #define VK_NAMESPACE_END }}} @@ -84,7 +87,8 @@ inline void copy(VkExtent3D &e3d,const VkExtent2D &e2d) bool CheckStrideBytesByFormat(); ///<检验所有数据类型长度数组是否符合规则 #endif//_DEBUG -uint32_t GetStrideByFormat(const VkFormat &); ///<根据数据类型获取访类型单个数据长度字节数 +uint32_t GetStrideByFormat(const VkFormat &); ///<根据数据类型获取得类型单个数据长度字节数 +const char *GetColorFormatName(const VkFormat &); ///<根据数据类型获取得类型名称 inline void debug_out(const hgl::List &layer_properties) { diff --git a/inc/hgl/graph/vulkan/VKFormat.h b/inc/hgl/graph/vulkan/VKFormat.h index e40bf56f..335e4ba4 100644 --- a/inc/hgl/graph/vulkan/VKFormat.h +++ b/inc/hgl/graph/vulkan/VKFormat.h @@ -6,6 +6,7 @@ #define FMT_UNDEFINED VK_FORMAT_UNDEFINED #define FMT_RG4UN VK_FORMAT_R4G4_UNORM_PACK8 + #define FMT_RGBA4 VK_FORMAT_R4G4B4A4_UNORM_PACK16 #define FMT_BGRA4 VK_FORMAT_B4G4R4A4_UNORM_PACK16 #define FMT_RGB565 VK_FORMAT_R5G6B5_UNORM_PACK16 @@ -16,58 +17,104 @@ #define FMT_R8UN VK_FORMAT_R8_UNORM #define FMT_R8SN VK_FORMAT_R8_SNORM +#define FMT_R8US VK_FORMAT_R8_USCALED +#define FMT_R8SS VK_FORMAT_R8_SSCALED #define FMT_R8U VK_FORMAT_R8_UINT #define FMT_R8I VK_FORMAT_R8_SINT #define FMT_R8s VK_FORMAT_R8_SRGB #define FMT_RG8UN VK_FORMAT_R8G8_UNORM #define FMT_RG8SN VK_FORMAT_R8G8_SNORM +#define FMT_RG8US VK_FORMAT_R8G8_USCALED +#define FMT_RG8SS VK_FORMAT_R8G8_SSCALED #define FMT_RG8U VK_FORMAT_R8G8_UINT #define FMT_RG8I VK_FORMAT_R8G8_SINT #define FMT_RG8s VK_FORMAT_R8G8_SRGB +//注：几乎任何GPU都不支持 RGB8,BGR8,RGB16 这三类格式，所以尽可能不要使用这三类格式 + +#define FMT_RGB8UN VK_FORMAT_R8G8B8_UNORM +#define FMT_RGB8SN VK_FORMAT_R8G8B8_SNORM +#define FMT_RGB8US VK_FORMAT_R8G8B8_USCALED +#define FMT_RGB8SS VK_FORMAT_R8G8B8_SSCALED +#define FMT_RGB8U VK_FORMAT_R8G8B8_UINT +#define FMT_RGB8I VK_FORMAT_R8G8B8_SINT +#define FMT_RGB8s VK_FORMAT_R8G8B8_SRGB + +#define FMT_BGR8UN VK_FORMAT_B8G8R8_UNORM +#define FMT_BGR8SN VK_FORMAT_B8G8R8_SNORM +#define FMT_BGR8US VK_FORMAT_B8G8R8_USCALED +#define FMT_BGR8SS VK_FORMAT_B8G8R8_SSCALED +#define FMT_BGR8U VK_FORMAT_B8G8R8_UINT +#define FMT_BGR8I VK_FORMAT_B8G8R8_SINT +#define FMT_BGR8s VK_FORMAT_B8G8R8_SRGB + #define FMT_RGBA8UN VK_FORMAT_R8G8B8A8_UNORM #define FMT_RGBA8SN VK_FORMAT_R8G8B8A8_SNORM +#define FMT_RGBA8US VK_FORMAT_R8G8B8A8_USCALED +#define FMT_RGBA8SS VK_FORMAT_R8G8B8A8_SSCALED #define FMT_RGBA8U VK_FORMAT_R8G8B8A8_UINT #define FMT_RGBA8I VK_FORMAT_R8G8B8A8_SINT #define FMT_RGBA8s VK_FORMAT_R8G8B8A8_SRGB #define FMT_BGRA8UN VK_FORMAT_B8G8R8A8_UNORM #define FMT_BGRA8SN VK_FORMAT_B8G8R8A8_SNORM +#define FMT_BGRA8US VK_FORMAT_B8G8R8A8_USCALED +#define FMT_BGRA8SS VK_FORMAT_B8G8R8A8_SSCALED #define FMT_BGRA8U VK_FORMAT_B8G8R8A8_UINT #define FMT_BGRA8I VK_FORMAT_B8G8R8A8_SINT #define FMT_BGRA8s VK_FORMAT_B8G8R8A8_SRGB #define FMT_ABGR8UN VK_FORMAT_A8B8G8R8_UNORM_PACK32 #define FMT_ABGR8SN VK_FORMAT_A8B8G8R8_SNORM_PACK32 +#define FMT_ABGR8US VK_FORMAT_A8B8G8R8_USCALED_PACK32 +#define FMT_ABGR8SS VK_FORMAT_A8B8G8R8_SSCALED_PACK32 #define FMT_ABGR8U VK_FORMAT_A8B8G8R8_UINT_PACK32 #define FMT_ABGR8I VK_FORMAT_A8B8G8R8_SINT_PACK32 #define FMT_ABGR8s VK_FORMAT_A8B8G8R8_SRGB_PACK32 #define FMT_A2RGB10UN VK_FORMAT_A2R10G10B10_UNORM_PACK32 #define FMT_A2RGB10SN VK_FORMAT_A2R10G10B10_SNORM_PACK32 +#define FMT_A2RGB10US VK_FORMAT_A2R10G10B10_USCALED_PACK32 +#define FMT_A2RGB10SS VK_FORMAT_A2R10G10B10_SSCALED_PACK32 #define FMT_A2RGB10U VK_FORMAT_A2R10G10B10_UINT_PACK32 #define FMT_A2RGB10I VK_FORMAT_A2R10G10B10_SINT_PACK32 #define FMT_A2BGR10UN VK_FORMAT_A2B10G10R10_UNORM_PACK32 #define FMT_A2BGR10SN VK_FORMAT_A2B10G10R10_SNORM_PACK32 +#define FMT_A2BGR10US VK_FORMAT_A2B10G10R10_USCALED_PACK32 +#define FMT_A2BGR10SS VK_FORMAT_A2B10G10R10_SSCALED_PACK32 #define FMT_A2BGR10U VK_FORMAT_A2B10G10R10_UINT_PACK32 #define FMT_A2BGR10I VK_FORMAT_A2B10G10R10_SINT_PACK32 #define FMT_R16UN VK_FORMAT_R16_UNORM #define FMT_R16SN VK_FORMAT_R16_SNORM +#define FMT_R16US VK_FORMAT_R16_USCALED +#define FMT_R16SS VK_FORMAT_R16_SSCALED #define FMT_R16U VK_FORMAT_R16_UINT #define FMT_R16I VK_FORMAT_R16_SINT #define FMT_R16F VK_FORMAT_R16_SFLOAT #define FMT_RG16UN VK_FORMAT_R16G16_UNORM #define FMT_RG16SN VK_FORMAT_R16G16_SNORM +#define FMT_RG16US VK_FORMAT_R16G16_USCALED +#define FMT_RG16SS VK_FORMAT_R16G16_SSCALED #define FMT_RG16U VK_FORMAT_R16G16_UINT #define FMT_RG16I VK_FORMAT_R16G16_SINT #define FMT_RG16F VK_FORMAT_R16G16_SFLOAT +#define FMT_RGB16UN VK_FORMAT_R16G16B16_UNORM +#define FMT_RGB16SN VK_FORMAT_R16G16B16_SNORM +#define FMT_RGB16US VK_FORMAT_R16G16B16_USCALED +#define FMT_RGB16SS VK_FORMAT_R16G16B16_SSCALED +#define FMT_RGB16U VK_FORMAT_R16G16B16_UINT +#define FMT_RGB16I VK_FORMAT_R16G16B16_SINT +#define FMT_RGB16F VK_FORMAT_R16G16B16_SFLOAT + #define FMT_RGBA16UN VK_FORMAT_R16G16B16A16_UNORM #define FMT_RGBA16SN VK_FORMAT_R16G16B16A16_SNORM +#define FMT_RGBA16US VK_FORMAT_R16G16B16A16_USCALED +#define FMT_RGBA16SS VK_FORMAT_R16G16B16A16_SSCALED #define FMT_RGBA16U VK_FORMAT_R16G16B16A16_UINT #define FMT_RGBA16I VK_FORMAT_R16G16B16A16_SINT #define FMT_RGBA16F VK_FORMAT_R16G16B16A16_SFLOAT @@ -104,11 +151,11 @@ #define FMT_RGBA64I VK_FORMAT_R64G64B64A64_SINT #define FMT_RGBA64F VK_FORMAT_R64G64B64A64_SFLOAT -#define FMT_B10GR11 VK_FORMAT_B10G11R11_UFLOAT_PACK32 -#define FMT_E5BGR9 VK_FORMAT_E5B9G9R9_UFLOAT_PACK32 +#define FMT_B10GR11UF VK_FORMAT_B10G11R11_UFLOAT_PACK32 +#define FMT_E5BGR9UF VK_FORMAT_E5B9G9R9_UFLOAT_PACK32 #define FMT_D16UN VK_FORMAT_D16_UNORM -#define FMT_X8_D24 VK_FORMAT_X8_D24_UNORM_PACK32 +#define FMT_X8_D24UN VK_FORMAT_X8_D24_UNORM_PACK32 #define FMT_D32F VK_FORMAT_D32_SFLOAT #define FMT_S8U VK_FORMAT_S8_UINT #define FMT_D16UN_S8U VK_FORMAT_D16_UNORM_S8_UINT diff --git a/src/RenderDevice/Shader/glsl2spv.cpp b/src/RenderDevice/Shader/glsl2spv.cpp index 39770503..e64be009 100644 --- a/src/RenderDevice/Shader/glsl2spv.cpp +++ b/src/RenderDevice/Shader/glsl2spv.cpp @@ -184,7 +184,8 @@ namespace hgl return false; } - glslang::GlslangToSpv(*program.getIntermediate(stage), spirv); + glslang::GlslangToSpv(*program.getIntermediate(stage),spirv); + return(true); } }//namespace graph }//namespace hgl diff --git a/src/RenderDevice/Vulkan/VKFormat.cpp b/src/RenderDevice/Vulkan/VKFormat.cpp index 6742fa31..097f5762 100644 --- a/src/RenderDevice/Vulkan/VKFormat.cpp +++ b/src/RenderDevice/Vulkan/VKFormat.cpp @@ -4,182 +4,204 @@ VK_NAMESPACE_BEGIN namespace { -#ifdef _DEBUG - struct StrideByFormat + //enum class ColorDataTypeEnum:uint8 + //{ + // X=0, + // R,G,B,A,DEPTH,STENCIL + //}; + + //enum class ColorDataType:uint8 + //{ + // UNORM=1, + // SNORM, + // USCALED, + // SSCALE, + // UINT, + // SINT, + // UFLOAT, + // SFLOAT, + // SRGB, + //};// + + struct VulkanTextureFormat { - VkFormat format; //格式，此值保留仅为参考 - uint32_t bytes; +#ifdef _DEBUG + VkFormat format; ///=STRIDE_FORMAT_COUNT)return(0); + if(format<=VK_FORMAT_UNDEFINED||format>=TEXTURE_FORMAT_COUNT)return(0); if(format<=VK_FORMAT_UNDEFINED ||format>=VK_FORMAT_BC1_RGB_UNORM_BLOCK)return 0; @@ -220,10 +242,10 @@ namespace #ifdef _DEBUG bool CheckStrideBytesByFormat() { - for(uint32 i=0;i=STRIDE_FORMAT_COUNT)return(0); + if(format<=VK_FORMAT_UNDEFINED||format>=TEXTURE_FORMAT_COUNT)return(0); - #ifdef _DEBUG - return stride_list[format].bytes; - #else - return stride_list[format]; - #endif//_DEBUG + return vulkan_format_list[format].bytes; +} + +const char *GetColorFormatName(const VkFormat &format) +{ + if(format<=VK_FORMAT_UNDEFINED||format>=TEXTURE_FORMAT_COUNT)return(nullptr); + + return vulkan_format_list[format].name; } VK_NAMESPACE_END diff --git a/src/RenderDevice/Vulkan/VKPhysicalDevice.cpp b/src/RenderDevice/Vulkan/VKPhysicalDevice.cpp index 5d80fa5d..432c961e 100644 --- a/src/RenderDevice/Vulkan/VKPhysicalDevice.cpp +++ b/src/RenderDevice/Vulkan/VKPhysicalDevice.cpp @@ -111,7 +111,7 @@ VkFormat PhysicalDevice::GetDepthFormat(bool lower_to_high)const constexpr VkFormat depthFormats[] = { FMT_D16UN, - FMT_X8_D24, + FMT_X8_D24UN, FMT_D16UN_S8U, FMT_D24UN_S8U, FMT_D32F,