lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-27 12:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux compile issues with some temporaries

Browse Source
This commit is contained in:
baldurk
2015-09-18 19:07:35 +02:00
parent a00688a86a
commit bc2dca08ba
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_manager.h
+4 -2
View File
@@ -75,13 +75,15 @@ class VulkanResourceManager : public ResourceManager<WrappedVkRes*, RealVkRes, V
template<typename realtype>
realtype GetLiveHandle(ResourceId origid)
{
return ((typename UnwrapHelper<realtype>::ParentType *)ResourceManager::GetLiveResource(origid))->real.As<realtype>();
RealVkRes res = ((typename UnwrapHelper<realtype>::ParentType *)ResourceManager::GetLiveResource(origid))->real;
return res.As<realtype>();
}
template<typename realtype>
realtype GetCurrentHandle(ResourceId id)
{
return ((typename UnwrapHelper<realtype>::ParentType *)ResourceManager::GetCurrentResource(id))->real.As<realtype>();
RealVkRes res = ((typename UnwrapHelper<realtype>::ParentType *)ResourceManager::GetCurrentResource(id))->real;
return res.As<realtype>();
}
// handling memory & image transitions
renderdoc/driver/vulkan/vk_resources.h
+6 -2
View File
@@ -406,7 +406,9 @@ RealType Unwrap(RealType obj)
{
if(obj == VK_NULL_HANDLE) return VK_NULL_HANDLE;
return GetWrapped(obj)->real.As<RealType>();
RealVkRes res = GetWrapped(obj)->real;
return res.As<RealType>();
}
template<typename RealType>
@@ -428,7 +430,9 @@ VkResourceRecord *GetRecord(RealType obj)
template<typename RealType>
RealType ToHandle(WrappedVkRes *ptr)
{
return ((typename UnwrapHelper<RealType>::Outer *)ptr)->real.As<RealType>();
RealVkRes res = ((typename UnwrapHelper<RealType>::Outer *)ptr)->real;
return res.As<RealType>();
}
enum VkResourceType