From 903f9081ebd37e604c7e6e7a8af71bd7312096be Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 24 Jun 2021 19:25:43 +0800 Subject: [PATCH] renamed VAF to VF, FMT to PF --- CMSceneGraph | 2 +- example/2dVector/line.cpp | 2 +- example/Vulkan/DeferredModel.cpp | 4 +- example/Vulkan/DrawTile.cpp | 6 +- example/Vulkan/FragCoordTest.cpp | 2 +- example/Vulkan/HQFilterTexture.cpp | 4 +- example/Vulkan/InlineGeometryScene.cpp | 4 +- example/Vulkan/OffscreenRender.cpp | 2 +- example/Vulkan/RectanglePrimitive.cpp | 4 +- example/Vulkan/first_triangle.cpp | 4 +- example/Vulkan/indices_rect.cpp | 2 +- example/Vulkan/texture_rect.cpp | 4 +- example/Vulkan/two_triangle.cpp | 4 +- example/common/VulkanAppFramework.h | 2 +- inc/hgl/graph/TextureLoader.h | 18 ++--- inc/hgl/graph/VertexAttribDataAccess.h | 64 +++++++++--------- inc/hgl/gui/ThemeEngine.h | 2 +- src/SceneGraph/Vulkan/VKDeviceRenderPass.cpp | 2 +- .../Vulkan/VKDeviceRenderTarget.cpp | 2 +- src/SceneGraph/Vulkan/VKPhysicalDevice.cpp | 18 ++--- src/SceneGraph/Vulkan/VKTextureLoader.cpp | 66 +++++++++---------- src/SceneGraph/Vulkan/VKTileFont.cpp | 2 +- src/SceneGraph/font/TextRenderable.cpp | 4 +- 23 files changed, 112 insertions(+), 112 deletions(-) diff --git a/CMSceneGraph b/CMSceneGraph index bc5ac1a5..cf93f6e0 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit bc5ac1a503cc57f42a232aaf7e59be9d7ccedbeb +Subproject commit cf93f6e0910d96ffd8dd840209f6e65f162e1cd9 diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index 49114601..d3f6db1f 100644 --- a/example/2dVector/line.cpp +++ b/example/2dVector/line.cpp @@ -101,7 +101,7 @@ private: Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position, db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); return(true); diff --git a/example/Vulkan/DeferredModel.cpp b/example/Vulkan/DeferredModel.cpp index 5af299c6..29190c92 100644 --- a/example/Vulkan/DeferredModel.cpp +++ b/example/Vulkan/DeferredModel.cpp @@ -33,8 +33,8 @@ enum class GBufferAttachment ENUM_CLASS_RANGE(Color,Normal) };// -constexpr VkFormat gbuffer_color_format[size_t(GBufferAttachment::RANGE_SIZE)]={UFMT_RGB565,FMT_RG8UN}; -constexpr VkFormat gbuffer_depth_format=FMT_D16UN; +constexpr VkFormat gbuffer_color_format[size_t(GBufferAttachment::RANGE_SIZE)]={UPF_RGB565,PF_RG8UN}; +constexpr VkFormat gbuffer_depth_format=PF_D16UN; struct alignas(16) PhongPointLight { diff --git a/example/Vulkan/DrawTile.cpp b/example/Vulkan/DrawTile.cpp index 0e57725a..abfdcf5d 100644 --- a/example/Vulkan/DrawTile.cpp +++ b/example/Vulkan/DrawTile.cpp @@ -86,7 +86,7 @@ private: bool InitTileTexture() { - tile_data=device->CreateTileData( FMT_BC1_RGBAUN, //纹理格式，因VK不支持实时转换，所以提交的数据格式必须与此一致 + tile_data=device->CreateTileData( PF_BC1_RGBAUN, //纹理格式，因VK不支持实时转换，所以提交的数据格式必须与此一致 512,512, //TILE大小 tile_list.GetCount()); //TILE需求数量 @@ -185,8 +185,8 @@ private: render_obj=db->CreateRenderable(tile_count); if(!render_obj)return(false); - render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC4,tile_count,vertex_data)); - render_obj->Set(VAN::TexCoord,db->CreateVAB(VAF_VEC4,tile_count,tex_coord_data)); + render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC4,tile_count,vertex_data)); + render_obj->Set(VAN::TexCoord,db->CreateVAB(VF_VEC4,tile_count,tex_coord_data)); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index 1d1c9316..5be62c5e 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -82,7 +82,7 @@ private: auto render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false); renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); return(true); diff --git a/example/Vulkan/HQFilterTexture.cpp b/example/Vulkan/HQFilterTexture.cpp index d5b9ac78..7b458f5c 100644 --- a/example/Vulkan/HQFilterTexture.cpp +++ b/example/Vulkan/HQFilterTexture.cpp @@ -82,10 +82,10 @@ private: bool InitVBO() { - vertex_buffer =device->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data); + vertex_buffer =device->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data); if(!vertex_buffer)return(false); - tex_coord_buffer=device->CreateVAB(VAF_VEC2,VERTEX_COUNT,tex_coord_data); + tex_coord_buffer=device->CreateVAB(VF_VEC2,VERTEX_COUNT,tex_coord_data); if(!tex_coord_buffer)return(false); index_buffer =device->CreateIBO16(INDEX_COUNT,index_data); diff --git a/example/Vulkan/InlineGeometryScene.cpp b/example/Vulkan/InlineGeometryScene.cpp index f94d4f29..4f2c266d 100644 --- a/example/Vulkan/InlineGeometryScene.cpp +++ b/example/Vulkan/InlineGeometryScene.cpp @@ -41,10 +41,10 @@ private: RenderList render_list; Material * material =nullptr; - MaterialParameters * material_instance =nullptr; + MaterialInstance * material_instance =nullptr; Material * axis_material =nullptr; - MaterialParameters * axis_mi =nullptr; + MaterialInstance * axis_mi =nullptr; PipelineData * pipeline_data =nullptr; Pipeline * axis_pipeline =nullptr; diff --git a/example/Vulkan/OffscreenRender.cpp b/example/Vulkan/OffscreenRender.cpp index f63d1db4..4c8a3c3f 100644 --- a/example/Vulkan/OffscreenRender.cpp +++ b/example/Vulkan/OffscreenRender.cpp @@ -77,7 +77,7 @@ public: bool InitOffscreen() { - FramebufferInfo fbi(UFMT_RGBA8,OFFSCREEN_SIZE,OFFSCREEN_SIZE); + FramebufferInfo fbi(UPF_RGBA8,OFFSCREEN_SIZE,OFFSCREEN_SIZE); os.render_taget=device->CreateRenderTarget(&fbi); if(!os.render_taget)return(false); diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index f93d3393..77706b83 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -91,8 +91,8 @@ private: if(!render_obj)return(false); - render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC4,VERTEX_COUNT,vertex_data)); - render_obj->Set(VAN::TexCoord,db->CreateVAB(VAF_VEC4,VERTEX_COUNT,tex_coord_data)); + render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC4,VERTEX_COUNT,vertex_data)); + render_obj->Set(VAN::TexCoord,db->CreateVAB(VF_VEC4,VERTEX_COUNT,tex_coord_data)); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index b51918aa..3c213456 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -92,8 +92,8 @@ private: Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false); - if(!render_obj->Set(VAN::Color, db->CreateVAB(VAF_VEC4,VERTEX_COUNT,color_data)))return(false); + if(!render_obj->Set(VAN::Position, db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Color, db->CreateVAB(VF_VEC4,VERTEX_COUNT,color_data)))return(false); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); return(true); diff --git a/example/Vulkan/indices_rect.cpp b/example/Vulkan/indices_rect.cpp index a0885878..e45fa95e 100644 --- a/example/Vulkan/indices_rect.cpp +++ b/example/Vulkan/indices_rect.cpp @@ -86,7 +86,7 @@ private: auto render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false); if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 7c6fef25..d6183b9a 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -118,8 +118,8 @@ private: auto render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false); - if(!render_obj->Set(VAN::TexCoord,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,tex_coord_data)))return(false); + if(!render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::TexCoord,db->CreateVAB(VF_VEC2,VERTEX_COUNT,tex_coord_data)))return(false); if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/Vulkan/two_triangle.cpp b/example/Vulkan/two_triangle.cpp index 92a01a23..18eba65b 100644 --- a/example/Vulkan/two_triangle.cpp +++ b/example/Vulkan/two_triangle.cpp @@ -87,8 +87,8 @@ private: Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false); - if(!render_obj->Set(VAN::Color, db->CreateVAB(VAF_VEC4,VERTEX_COUNT,color_data)))return(false); + if(!render_obj->Set(VAN::Position, db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Color, db->CreateVAB(VF_VEC4,VERTEX_COUNT,color_data)))return(false); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index 758fb428..6eb4ad7f 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -105,7 +105,7 @@ public: cili.lunarg.standard_validation = true; cili.khronos.validation = true; - cili.RenderDoc.Capture = true; + //cili.RenderDoc.Capture = true; inst=CreateInstance("VulkanTest",nullptr,&cili); diff --git a/inc/hgl/graph/TextureLoader.h b/inc/hgl/graph/TextureLoader.h index b9fa84fd..cb3d782a 100644 --- a/inc/hgl/graph/TextureLoader.h +++ b/inc/hgl/graph/TextureLoader.h @@ -11,15 +11,15 @@ namespace hgl { constexpr VkFormat CompressFormatList[]= { - FMT_BC1_RGBUN, - FMT_BC1_RGBAUN, - FMT_BC2UN, - FMT_BC3UN, - FMT_BC4UN, - FMT_BC5UN, - FMT_BC6UF, - FMT_BC6SF, - FMT_BC7UN + PF_BC1_RGBUN, + PF_BC1_RGBAUN, + PF_BC2UN, + PF_BC3UN, + PF_BC4UN, + PF_BC5UN, + PF_BC6UF, + PF_BC6SF, + PF_BC7UN }; constexpr uint32 CompressFormatBits[]={4,4,8,8,4,8,8,8,8}; diff --git a/inc/hgl/graph/VertexAttribDataAccess.h b/inc/hgl/graph/VertexAttribDataAccess.h index b829fef9..6931bbe8 100644 --- a/inc/hgl/graph/VertexAttribDataAccess.h +++ b/inc/hgl/graph/VertexAttribDataAccess.h @@ -1140,41 +1140,41 @@ namespace hgl };//class VertexAttribDataAccess4 //缓冲区具体数据类型定义 - typedef VertexAttribDataAccess1 VB1i8 ,VB1b; - typedef VertexAttribDataAccess1 VB1i16 ,VB1s; - typedef VertexAttribDataAccess1 VB1i32 ,VB1i; - typedef VertexAttribDataAccess1 VB1u8 ,VB1ub; - typedef VertexAttribDataAccess1 VB1u16 ,VB1us; - typedef VertexAttribDataAccess1 VB1u32 ,VB1ui; - typedef VertexAttribDataAccess1 VB1f; - typedef VertexAttribDataAccess1 VB1d; + typedef VertexAttribDataAccess1 VB1i8 ,VB1b; + typedef VertexAttribDataAccess1 VB1i16 ,VB1s; + typedef VertexAttribDataAccess1 VB1i32 ,VB1i; + typedef VertexAttribDataAccess1 VB1u8 ,VB1ub; + typedef VertexAttribDataAccess1 VB1u16 ,VB1us; + typedef VertexAttribDataAccess1 VB1u32 ,VB1ui; + typedef VertexAttribDataAccess1 VB1f; + typedef VertexAttribDataAccess1 VB1d; - typedef VertexAttribDataAccess2 VB2i8 ,VB2b; - typedef VertexAttribDataAccess2 VB2i16 ,VB2s; - typedef VertexAttribDataAccess2 VB2i32 ,VB2i; - typedef VertexAttribDataAccess2 VB2u8 ,VB2ub; - typedef VertexAttribDataAccess2 VB2u16 ,VB2us; - typedef VertexAttribDataAccess2 VB2u32 ,VB2ui; - typedef VertexAttribDataAccess2 VB2f; - typedef VertexAttribDataAccess2 VB2d; + typedef VertexAttribDataAccess2 VB2i8 ,VB2b; + typedef VertexAttribDataAccess2 VB2i16 ,VB2s; + typedef VertexAttribDataAccess2 VB2i32 ,VB2i; + typedef VertexAttribDataAccess2 VB2u8 ,VB2ub; + typedef VertexAttribDataAccess2 VB2u16 ,VB2us; + typedef VertexAttribDataAccess2 VB2u32 ,VB2ui; + typedef VertexAttribDataAccess2 VB2f; + typedef VertexAttribDataAccess2 VB2d; -// typedef VertexAttribDataAccess3 VB3i8 ,VB3b; -// typedef VertexAttribDataAccess3 VB3i16 ,VB3s; - typedef VertexAttribDataAccess3 VB3i32 ,VB3i; -// typedef VertexAttribDataAccess3 VB3u8 ,VB3ub; -// typedef VertexAttribDataAccess3 VB3u16 ,VB3us; - typedef VertexAttribDataAccess3 VB3u32 ,VB3ui; - typedef VertexAttribDataAccess3 VB3f; - typedef VertexAttribDataAccess3 VB3d; +// typedef VertexAttribDataAccess3 VB3i8 ,VB3b; +// typedef VertexAttribDataAccess3 VB3i16 ,VB3s; + typedef VertexAttribDataAccess3 VB3i32 ,VB3i; +// typedef VertexAttribDataAccess3 VB3u8 ,VB3ub; +// typedef VertexAttribDataAccess3 VB3u16 ,VB3us; + typedef VertexAttribDataAccess3 VB3u32 ,VB3ui; + typedef VertexAttribDataAccess3 VB3f; + typedef VertexAttribDataAccess3 VB3d; - typedef VertexAttribDataAccess4 VB4i8 ,VB4b; - typedef VertexAttribDataAccess4 VB4i16 ,VB4s; - typedef VertexAttribDataAccess4 VB4i32 ,VB4i; - typedef VertexAttribDataAccess4 VB4u8 ,VB4ub; - typedef VertexAttribDataAccess4 VB4u16 ,VB4us; - typedef VertexAttribDataAccess4 VB4u32 ,VB4ui; - typedef VertexAttribDataAccess4 VB4f; - typedef VertexAttribDataAccess4 VB4d; + typedef VertexAttribDataAccess4 VB4i8 ,VB4b; + typedef VertexAttribDataAccess4 VB4i16 ,VB4s; + typedef VertexAttribDataAccess4 VB4i32 ,VB4i; + typedef VertexAttribDataAccess4 VB4u8 ,VB4ub; + typedef VertexAttribDataAccess4 VB4u16 ,VB4us; + typedef VertexAttribDataAccess4 VB4u32 ,VB4ui; + typedef VertexAttribDataAccess4 VB4f; + typedef VertexAttribDataAccess4 VB4d; }//namespace graph }//namespace hgl #endif//HGL_GRAPH_VERTEX_ATTRIB_DATA_ACCESS_INCLUDE diff --git a/inc/hgl/gui/ThemeEngine.h b/inc/hgl/gui/ThemeEngine.h index a553b97b..8a0c0cae 100644 --- a/inc/hgl/gui/ThemeEngine.h +++ b/inc/hgl/gui/ThemeEngine.h @@ -13,7 +13,7 @@ namespace hgl class GPUDevice; }//namespace vulkan - constexpr VkFormat DefaultRenderTargetFormat=UFMT_ABGR8; ///<缺省窗体绘图表面格式 + constexpr VkFormat DefaultRenderTargetFormat=UPF_ABGR8; ///<缺省窗体绘图表面格式 class ThemeEngine { diff --git a/src/SceneGraph/Vulkan/VKDeviceRenderPass.cpp b/src/SceneGraph/Vulkan/VKDeviceRenderPass.cpp index 1d55e3b6..9560f416 100644 --- a/src/SceneGraph/Vulkan/VKDeviceRenderPass.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceRenderPass.cpp @@ -114,7 +114,7 @@ bool CreateAttachmentDescription(List &desc_list,const ++cf; } - if(rbi->GetDepthFormat()!=FMT_UNDEFINED) + if(rbi->GetDepthFormat()!=PF_UNDEFINED) { desc->finalLayout = rbi->GetDepthLayout(); desc->format = rbi->GetDepthFormat(); diff --git a/src/SceneGraph/Vulkan/VKDeviceRenderTarget.cpp b/src/SceneGraph/Vulkan/VKDeviceRenderTarget.cpp index 6b7b69f0..7d3a4a90 100644 --- a/src/SceneGraph/Vulkan/VKDeviceRenderTarget.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceRenderTarget.cpp @@ -38,7 +38,7 @@ RenderTarget *GPUDevice::CreateRenderTarget(const FramebufferInfo *fbi,const uin *iv++=color_texture->GetImageView(); } - Texture2D *depth_texture=(depth_format!=FMT_UNDEFINED)?CreateTexture2D(new DepthAttachmentTextureCreateInfo(depth_format,extent)):nullptr; + Texture2D *depth_texture=(depth_format!=PF_UNDEFINED)?CreateTexture2D(new DepthAttachmentTextureCreateInfo(depth_format,extent)):nullptr; Framebuffer *fb=CreateFramebuffer(rp,color_iv_list,color_count,depth_texture?depth_texture->GetImageView():nullptr); diff --git a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp index 8cf121f7..ba51892a 100644 --- a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp +++ b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp @@ -85,12 +85,12 @@ VkFormat GPUPhysicalDevice::GetDepthFormat(bool lower_to_high)const { constexpr VkFormat depthFormats[] = { - FMT_D16UN, - FMT_X8_D24UN, - FMT_D16UN_S8U, - FMT_D24UN_S8U, - FMT_D32F, - FMT_D32F_S8U + PF_D16UN, + PF_X8_D24UN, + PF_D16UN_S8U, + PF_D24UN_S8U, + PF_D32F, + PF_D32F_S8U }; VkFormat result=VK_FORMAT_UNDEFINED; @@ -113,9 +113,9 @@ VkFormat GPUPhysicalDevice::GetDepthStencilFormat(bool lower_to_high)const { constexpr VkFormat depthStencilFormats[] = { - FMT_D16UN_S8U, - FMT_D24UN_S8U, - FMT_D32F_S8U + PF_D16UN_S8U, + PF_D24UN_S8U, + PF_D32F_S8U }; VkFormat result=VK_FORMAT_UNDEFINED; diff --git a/src/SceneGraph/Vulkan/VKTextureLoader.cpp b/src/SceneGraph/Vulkan/VKTextureLoader.cpp index 746d903f..f1503a56 100644 --- a/src/SceneGraph/Vulkan/VKTextureLoader.cpp +++ b/src/SceneGraph/Vulkan/VKTextureLoader.cpp @@ -24,39 +24,39 @@ namespace constexpr PixelFormat pf_list[]= { - {UFMT_BGRA4, 4,{'B','G','R','A'},{ 4, 4, 4, 4},VulkanDataType::UNORM}, - {UFMT_RGB565, 3,{'R','G','B', 0 },{ 5, 6, 5, 0},VulkanDataType::UNORM}, - {UFMT_A1RGB5, 4,{'A','R','G','B'},{ 1, 5, 5, 5},VulkanDataType::UNORM}, - {UFMT_R8, 1,{'R', 0 , 0 , 0 },{ 8, 0, 0, 0},VulkanDataType::UNORM}, - {UFMT_RG8, 2,{'R','G', 0 , 0 },{ 8, 8, 0, 0},VulkanDataType::UNORM}, - {UFMT_RGBA8, 4,{'R','G','B','A'},{ 8, 8, 8, 8},VulkanDataType::UNORM}, - {UFMT_RGBA8S, 4,{'R','G','B','A'},{ 8, 8, 8, 8},VulkanDataType::SNORM}, - {UFMT_RGBA8U, 4,{'R','G','B','A'},{ 8, 8, 8, 8},VulkanDataType::UINT}, - {UFMT_RGBA8I, 4,{'R','G','B','A'},{ 8, 8, 8, 8},VulkanDataType::SINT}, - {UFMT_ABGR8, 4,{'A','B','G','R'},{ 8, 8, 8, 8},VulkanDataType::UNORM}, - {UFMT_A2BGR10, 4,{'A','B','G','R'},{ 2,10,10,10},VulkanDataType::UNORM}, - {UFMT_R16, 1,{'R', 0 , 0 , 0 },{16, 0, 0, 0},VulkanDataType::UNORM}, - {UFMT_R16F, 1,{'R', 0 , 0 , 0 },{16, 0, 0, 0},VulkanDataType::SFLOAT}, - {UFMT_RG16, 2,{'R','G', 0 , 0 },{16,16, 0, 0},VulkanDataType::UNORM}, - {UFMT_RG16F, 2,{'R','G', 0 , 0 },{16,16, 0, 0},VulkanDataType::SFLOAT}, - { FMT_RGBA16UN, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::UNORM}, - { FMT_RGBA16SN, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::SNORM}, - {UFMT_RGBA16U, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::UINT}, - {UFMT_RGBA16I, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::SINT}, - {UFMT_RGBA16F, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::SFLOAT}, - {UFMT_R32U, 1,{'R', 0 , 0 , 0 },{32, 0, 0, 0},VulkanDataType::UINT}, - {UFMT_R32I, 1,{'R', 0 , 0 , 0 },{32, 0, 0, 0},VulkanDataType::SINT}, - {UFMT_R32F, 1,{'R', 0 , 0 , 0 },{32, 0, 0, 0},VulkanDataType::SFLOAT}, - {UFMT_RG32U, 2,{'R','G', 0 , 0 },{32,32, 0, 0},VulkanDataType::UINT}, - {UFMT_RG32I, 2,{'R','G', 0 , 0 },{32,32, 0, 0},VulkanDataType::SINT}, - {UFMT_RG32F, 2,{'R','G', 0 , 0 },{32,32, 0, 0},VulkanDataType::SFLOAT}, - { FMT_RGB32U, 3,{'R','G','B', 0 },{32,32,32, 0},VulkanDataType::UINT}, - { FMT_RGB32I, 3,{'R','G','B', 0 },{32,32,32, 0},VulkanDataType::SINT}, - { FMT_RGB32F, 3,{'R','G','B', 0 },{32,32,32, 0},VulkanDataType::SFLOAT}, - {UFMT_RGBA32U, 4,{'R','G','B','A'},{32,32,32,32},VulkanDataType::UINT}, - {UFMT_RGBA32I, 4,{'R','G','B','A'},{32,32,32,32},VulkanDataType::SINT}, - {UFMT_RGBA32F, 4,{'R','G','B','A'},{32,32,32,32},VulkanDataType::SFLOAT}, - {UFMT_B10GR11UF, 3,{'B','G','R', 0 },{10,11,11, 0},VulkanDataType::UFLOAT} + {UPF_BGRA4, 4,{'B','G','R','A'},{ 4, 4, 4, 4},VulkanDataType::UNORM}, + {UPF_RGB565, 3,{'R','G','B', 0 },{ 5, 6, 5, 0},VulkanDataType::UNORM}, + {UPF_A1RGB5, 4,{'A','R','G','B'},{ 1, 5, 5, 5},VulkanDataType::UNORM}, + {UPF_R8, 1,{'R', 0 , 0 , 0 },{ 8, 0, 0, 0},VulkanDataType::UNORM}, + {UPF_RG8, 2,{'R','G', 0 , 0 },{ 8, 8, 0, 0},VulkanDataType::UNORM}, + {UPF_RGBA8, 4,{'R','G','B','A'},{ 8, 8, 8, 8},VulkanDataType::UNORM}, + {UPF_RGBA8S, 4,{'R','G','B','A'},{ 8, 8, 8, 8},VulkanDataType::SNORM}, + {UPF_RGBA8U, 4,{'R','G','B','A'},{ 8, 8, 8, 8},VulkanDataType::UINT}, + {UPF_RGBA8I, 4,{'R','G','B','A'},{ 8, 8, 8, 8},VulkanDataType::SINT}, + {UPF_ABGR8, 4,{'A','B','G','R'},{ 8, 8, 8, 8},VulkanDataType::UNORM}, + {UPF_A2BGR10, 4,{'A','B','G','R'},{ 2,10,10,10},VulkanDataType::UNORM}, + {UPF_R16, 1,{'R', 0 , 0 , 0 },{16, 0, 0, 0},VulkanDataType::UNORM}, + {UPF_R16F, 1,{'R', 0 , 0 , 0 },{16, 0, 0, 0},VulkanDataType::SFLOAT}, + {UPF_RG16, 2,{'R','G', 0 , 0 },{16,16, 0, 0},VulkanDataType::UNORM}, + {UPF_RG16F, 2,{'R','G', 0 , 0 },{16,16, 0, 0},VulkanDataType::SFLOAT}, + { PF_RGBA16UN, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::UNORM}, + { PF_RGBA16SN, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::SNORM}, + {UPF_RGBA16U, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::UINT}, + {UPF_RGBA16I, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::SINT}, + {UPF_RGBA16F, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::SFLOAT}, + {UPF_R32U, 1,{'R', 0 , 0 , 0 },{32, 0, 0, 0},VulkanDataType::UINT}, + {UPF_R32I, 1,{'R', 0 , 0 , 0 },{32, 0, 0, 0},VulkanDataType::SINT}, + {UPF_R32F, 1,{'R', 0 , 0 , 0 },{32, 0, 0, 0},VulkanDataType::SFLOAT}, + {UPF_RG32U, 2,{'R','G', 0 , 0 },{32,32, 0, 0},VulkanDataType::UINT}, + {UPF_RG32I, 2,{'R','G', 0 , 0 },{32,32, 0, 0},VulkanDataType::SINT}, + {UPF_RG32F, 2,{'R','G', 0 , 0 },{32,32, 0, 0},VulkanDataType::SFLOAT}, + { PF_RGB32U, 3,{'R','G','B', 0 },{32,32,32, 0},VulkanDataType::UINT}, + { PF_RGB32I, 3,{'R','G','B', 0 },{32,32,32, 0},VulkanDataType::SINT}, + { PF_RGB32F, 3,{'R','G','B', 0 },{32,32,32, 0},VulkanDataType::SFLOAT}, + {UPF_RGBA32U, 4,{'R','G','B','A'},{32,32,32,32},VulkanDataType::UINT}, + {UPF_RGBA32I, 4,{'R','G','B','A'},{32,32,32,32},VulkanDataType::SINT}, + {UPF_RGBA32F, 4,{'R','G','B','A'},{32,32,32,32},VulkanDataType::SFLOAT}, + {UPF_B10GR11UF, 3,{'B','G','R', 0 },{10,11,11, 0},VulkanDataType::UFLOAT} }; constexpr uint PixelFormatCount=sizeof(pf_list)/sizeof(PixelFormat); diff --git a/src/SceneGraph/Vulkan/VKTileFont.cpp b/src/SceneGraph/Vulkan/VKTileFont.cpp index 3f354a49..e7d60ba5 100644 --- a/src/SceneGraph/Vulkan/VKTileFont.cpp +++ b/src/SceneGraph/Vulkan/VKTileFont.cpp @@ -23,7 +23,7 @@ TileFont *GPUDevice::CreateTileFont(FontSource *fs,int limit_count) if(!fs) return(nullptr); - TileData *td=CreateTileData(UFMT_R8,height,height,limit_count); + TileData *td=CreateTileData(UPF_R8,height,height,limit_count); if(!td) return nullptr; diff --git a/src/SceneGraph/font/TextRenderable.cpp b/src/SceneGraph/font/TextRenderable.cpp index 857c7b80..27538f5d 100644 --- a/src/SceneGraph/font/TextRenderable.cpp +++ b/src/SceneGraph/font/TextRenderable.cpp @@ -35,7 +35,7 @@ namespace hgl if(vab_position) delete vab_position; - vab_position =device->CreateVAB(VAF_VEC4,max_count); + vab_position =device->CreateVAB(VF_VEC4,max_count); Set(VAN::Position,vab_position); } @@ -43,7 +43,7 @@ namespace hgl if(vab_tex_coord) delete vab_tex_coord; - vab_tex_coord =device->CreateVAB(VAF_VEC4,max_count); + vab_tex_coord =device->CreateVAB(VF_VEC4,max_count); Set(VAN::TexCoord,vab_tex_coord); } }