used uint instead of int in Size of viewport
This commit is contained in:
parent
ba2d479f05
commit
deefdf1416
@ -1 +1 @@
|
||||
Subproject commit 5a12a0cac7e4a5b935bd7112f3ec70179c5216b4
|
||||
Subproject commit 679c9d4eccdc34e7add4da42d82dfb3e795c5600
|
BIN
doc/Gizmo.odg
BIN
doc/Gizmo.odg
Binary file not shown.
@ -90,7 +90,7 @@ public:
|
||||
SAFE_CLEAR(inst);
|
||||
}
|
||||
|
||||
virtual bool Init(int w,int h)
|
||||
virtual bool Init(uint w,uint h)
|
||||
{
|
||||
logger::InitLogger(OS_TEXT("VulkanTest"));
|
||||
|
||||
@ -159,7 +159,7 @@ public:
|
||||
return(true);
|
||||
}
|
||||
|
||||
virtual void Resize(int w,int h)
|
||||
virtual void Resize(uint w,uint h)
|
||||
{
|
||||
vp_info.Set(w,h);
|
||||
ubo_vp_info->Write(&vp_info);
|
||||
@ -494,7 +494,7 @@ public:
|
||||
SAFE_CLEAR(camera);
|
||||
}
|
||||
|
||||
virtual bool Init(int w,int h) override
|
||||
virtual bool Init(uint w,uint h) override
|
||||
{
|
||||
if(!VulkanApplicationFramework::Init(w,h))
|
||||
return(false);
|
||||
@ -526,7 +526,7 @@ public:
|
||||
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);
|
||||
|
||||
@ -580,7 +580,7 @@ public:
|
||||
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))
|
||||
return(false);
|
||||
@ -595,7 +595,7 @@ public:
|
||||
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);
|
||||
|
||||
|
@ -62,6 +62,7 @@ namespace
|
||||
VkResult CreateDebugUtilsMessengerEXT(VkInstance instance,const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo,const VkAllocationCallbacks *pAllocator,VkDebugUtilsMessengerEXT *pDebugMessenger)
|
||||
{
|
||||
auto func=(PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance,"vkCreateDebugUtilsMessengerEXT");
|
||||
|
||||
if(func)
|
||||
{
|
||||
return func(instance,pCreateInfo,pAllocator,pDebugMessenger);
|
||||
@ -75,6 +76,7 @@ namespace
|
||||
void DestroyDebugUtilsMessengerEXT(VkInstance instance,VkDebugUtilsMessengerEXT debugMessenger,const VkAllocationCallbacks *pAllocator)
|
||||
{
|
||||
auto func=(PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance,"vkDestroyDebugUtilsMessengerEXT");
|
||||
|
||||
if(func)
|
||||
{
|
||||
func(instance,debugMessenger,pAllocator);
|
||||
@ -85,10 +87,8 @@ namespace
|
||||
VkDebugUtilsMessageTypeFlagsEXT messageType,
|
||||
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData)
|
||||
{
|
||||
if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
|
||||
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_ERROR_BIT_EXT) 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_INFO_BIT_EXT) std::cerr<<"[INFO] "; else
|
||||
if(messageSeverity&VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) std::cerr<<"[VERBOSE] "; else
|
||||
std::cerr<<"[Validation layer] ";
|
||||
@ -147,10 +147,8 @@ namespace
|
||||
{
|
||||
const char *obj_type_name=GetVkDebugReportObjectTypename(objType);
|
||||
|
||||
if(msgFlags&VK_DEBUG_REPORT_ERROR_BIT_EXT)
|
||||
std::cerr<<"[ERROR:"; else
|
||||
if(msgFlags&VK_DEBUG_REPORT_WARNING_BIT_EXT)
|
||||
std::cerr<<"[WARNING:"; else
|
||||
if(msgFlags&VK_DEBUG_REPORT_ERROR_BIT_EXT) std::cerr<<"[ERROR:"; 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_INFORMATION_BIT_EXT) std::cerr<<"[INFO:"; else
|
||||
if(msgFlags&VK_DEBUG_REPORT_DEBUG_BIT_EXT) std::cerr<<"[DEBUG:";
|
||||
|
Loading…
x
Reference in New Issue
Block a user