nerdcruft/libcruft-vk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

except: prefer fun references to func pointers

Browse Source
This commit is contained in:
Danny Robson 2017-09-06 13:46:52 +10:00
parent 9a07fc2496
commit 364659b8af
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fence.cpp
View File

@ -42,7 +42,7 @@ fence::reset (const device &dev, fence *first, fence *last)
CHECK_LE (first, last);
cruft::vk::error::try_func (
&vkResetFences, dev.id (), trunc_cast<uint32_t> (last - first), &first->id ()
vkResetFences, dev.id (), trunc_cast<uint32_t> (last - first), &first->id ()
);
}
@ -54,7 +54,7 @@ fence::wait (const device &d, fence *first, fence *last, uint64_t timeout)
CHECK_LE (first, last);
cruft::vk::error::try_func (
&vkWaitForFences, d.id (), trunc_cast<uint32_t> (last - first), &first->id (), VK_FALSE, timeout
vkWaitForFences, d.id (), trunc_cast<uint32_t> (last - first), &first->id (), VK_FALSE, timeout
);
}
@ -66,6 +66,6 @@ fence::wait_all (const device &d, fence *first, fence *last, uint64_t timeout)
CHECK_LE (first, last);
cruft::vk::error::try_func (
&vkWaitForFences, d.id (), trunc_cast<uint32_t> (last - first), &first->id (), VK_TRUE, timeout
vkWaitForFences, d.id (), trunc_cast<uint32_t> (last - first), &first->id (), VK_TRUE, timeout
);
}

6
object.cpp
View File

@ -76,15 +76,15 @@ VK_DESCENDANT_TYPE_MAP (DESCENDANT)
///////////////////////////////////////////////////////////////////////////////
template <typename T>
std::vector<T>
cruft::vk::enumerated<T>::find (const instance &inst) {
cruft::vk::enumerated<T>::find (const instance &parent) {
// find the total number of objects
uint32_t expected = 0;
error::try_code (enum_traits<T>::enumerate (inst.id (), &expected, nullptr));
error::try_code (enum_traits<T>::enumerate (parent.id (), &expected, nullptr));
// allocate an array of handles and fetch them
uint32_t found = expected;
typename T::id_t handles[expected];
error::try_code (enum_traits<T>::enumerate (inst.id (), &found, handles));
error::try_code (enum_traits<T>::enumerate (parent.id (), &found, handles));
// return an collection of objects from the handles
return std::vector<T> (handles, handles + found);

3
object.hpp
View File

@ -105,7 +105,8 @@ namespace cruft::vk {
struct enumerated : public object<T> {
using object<T>::object;
static std::vector<T> find (const instance&);
static std::vector<T>
find (const instance &parent);
};

6
tools/hello.cpp
View File

@ -105,7 +105,7 @@ main (void)
auto func = (decltype(&vkCreateDebugReportCallbackEXT))vkGetInstanceProcAddr (instance.id (),"vkCreateDebugReportCallbackEXT");
cruft::vk::error::try_func (
func, instance.id (), &debug_info, nullptr, &callback
*func, instance.id (), &debug_info, nullptr, &callback
);
}
@ -584,14 +584,14 @@ main (void)
present_info.pImageIndices = &image_index;
present_info.pResults = nullptr;
cruft::vk::error::try_func (&vkQueuePresentKHR, present_queue.id (), &present_info);
cruft::vk::error::try_func (vkQueuePresentKHR, present_queue.id (), &present_info);
LOG_INFO ("entering runloop");
while (!glfwWindowShouldClose (window)) {
glfwPollEvents ();
}
cruft::vk::error::try_func (&vkDeviceWaitIdle, ldevice.id ());
cruft::vk::error::try_func (vkDeviceWaitIdle, ldevice.id ());
LOG_INFO ("terminating glfw");
glfwDestroyWindow (window);