hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

used uint instead of int in Size of viewport

Browse Source
This commit is contained in:
hyzboy 2023-11-10 04:24:10 +08:00
parent ba2d479f05
commit deefdf1416
No known key found for this signature in database
GPG Key ID: 067EE4525D4FB6D3
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 5a12a0cac7e4a5b935bd7112f3ec70179c5216b4 Subproject commit 679c9d4eccdc34e7add4da42d82dfb3e795c5600

BIN
doc/Gizmo.odg
View File

Binary file not shown.

12
example/common/VulkanAppFramework.h
View File

@ -90,7 +90,7 @@ public:
SAFE_CLEAR(inst); SAFE_CLEAR(inst);
} }
virtual bool Init(int w,int h) virtual bool Init(uint w,uint h)
{ {
logger::InitLogger(OS_TEXT("VulkanTest")); logger::InitLogger(OS_TEXT("VulkanTest"));
@ -159,7 +159,7 @@ public:
return(true); return(true);
} }
virtual void Resize(int w,int h) virtual void Resize(uint w,uint h)
{ {
vp_info.Set(w,h); vp_info.Set(w,h);
ubo_vp_info->Write(&vp_info); ubo_vp_info->Write(&vp_info);
@ -494,7 +494,7 @@ public:
SAFE_CLEAR(camera); SAFE_CLEAR(camera);
} }
virtual bool Init(int w,int h) override virtual bool Init(uint w,uint h) override
{ {
if(!VulkanApplicationFramework::Init(w,h)) if(!VulkanApplicationFramework::Init(w,h))
return(false); return(false);
@ -526,7 +526,7 @@ public:
db->global_descriptor.AddUBO(mtl::SBS_CameraInfo.name,ubo_camera_info); db->global_descriptor.AddUBO(mtl::SBS_CameraInfo.name,ubo_camera_info);
} }
void Resize(int w,int h)override void Resize(uint w,uint h)override
{ {
vp_info.Set(w,h); vp_info.Set(w,h);
@ -580,7 +580,7 @@ public:
SAFE_CLEAR(render_list); SAFE_CLEAR(render_list);
} }
virtual bool Init(int width,int height) override virtual bool Init(uint width,uint height) override
{ {
if(!CameraAppFramework::Init(width,height)) if(!CameraAppFramework::Init(width,height))
return(false); return(false);
@ -595,7 +595,7 @@ public:
VulkanApplicationFramework::BuildCommandBuffer(index,render_list); VulkanApplicationFramework::BuildCommandBuffer(index,render_list);
} }
virtual void Resize(int w,int h) override virtual void Resize(uint w,uint h) override
{ {
CameraAppFramework::Resize(w,h); CameraAppFramework::Resize(w,h);

14
src/SceneGraph/Vulkan/Debug/VKDebugOut.cpp
View File

@ -62,6 +62,7 @@ namespace
VkResult CreateDebugUtilsMessengerEXT(VkInstance instance,const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo,const VkAllocationCallbacks *pAllocator,VkDebugUtilsMessengerEXT *pDebugMessenger) VkResult CreateDebugUtilsMessengerEXT(VkInstance instance,const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo,const VkAllocationCallbacks *pAllocator,VkDebugUtilsMessengerEXT *pDebugMessenger)
{ {
auto func=(PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance,"vkCreateDebugUtilsMessengerEXT"); auto func=(PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance,"vkCreateDebugUtilsMessengerEXT");
if(func) if(func)
{ {
return func(instance,pCreateInfo,pAllocator,pDebugMessenger); return func(instance,pCreateInfo,pAllocator,pDebugMessenger);
@ -75,6 +76,7 @@ namespace
void DestroyDebugUtilsMessengerEXT(VkInstance instance,VkDebugUtilsMessengerEXT debugMessenger,const VkAllocationCallbacks *pAllocator) void DestroyDebugUtilsMessengerEXT(VkInstance instance,VkDebugUtilsMessengerEXT debugMessenger,const VkAllocationCallbacks *pAllocator)
{ {
auto func=(PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance,"vkDestroyDebugUtilsMessengerEXT"); auto func=(PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance,"vkDestroyDebugUtilsMessengerEXT");
if(func) if(func)
{ {
func(instance,debugMessenger,pAllocator); func(instance,debugMessenger,pAllocator);
@ -85,10 +87,8 @@ namespace
VkDebugUtilsMessageTypeFlagsEXT messageType, VkDebugUtilsMessageTypeFlagsEXT messageType,
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData) const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData)
{ {
if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) std::cerr<<"[ERROR] "; else
std::cerr<<"[ERROR] "; else if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) std::cerr<<"[WARNING] "; else
if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
std::cerr<<"[WARNING] "; else
if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) std::cerr<<"[INFO] "; else if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) std::cerr<<"[INFO] "; else
if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) std::cerr<<"[VERBOSE] "; else if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) std::cerr<<"[VERBOSE] "; else
std::cerr<<"[Validation layer] "; std::cerr<<"[Validation layer] ";
@ -147,10 +147,8 @@ namespace
{ {
const char *obj_type_name=GetVkDebugReportObjectTypename(objType); const char *obj_type_name=GetVkDebugReportObjectTypename(objType);
if(msgFlags&VK_DEBUG_REPORT_ERROR_BIT_EXT) if(msgFlags&VK_DEBUG_REPORT_ERROR_BIT_EXT) std::cerr<<"[ERROR:"; else
std::cerr<<"[ERROR:"; else if(msgFlags&VK_DEBUG_REPORT_WARNING_BIT_EXT) std::cerr<<"[WARNING:"; else
if(msgFlags&VK_DEBUG_REPORT_WARNING_BIT_EXT)
std::cerr<<"[WARNING:"; else
if(msgFlags&VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT)std::cerr<<"[PERFORMANCE WARNING:"; else if(msgFlags&VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT)std::cerr<<"[PERFORMANCE WARNING:"; else
if(msgFlags&VK_DEBUG_REPORT_INFORMATION_BIT_EXT) std::cerr<<"[INFO:"; else if(msgFlags&VK_DEBUG_REPORT_INFORMATION_BIT_EXT) std::cerr<<"[INFO:"; else
if(msgFlags&VK_DEBUG_REPORT_DEBUG_BIT_EXT) std::cerr<<"[DEBUG:"; if(msgFlags&VK_DEBUG_REPORT_DEBUG_BIT_EXT) std::cerr<<"[DEBUG:";