Skip to content

some minor fixes #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: cpp
Choose a base branch
from
Open

some minor fixes #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98dc68c
Fix pipelinestatistics example
lucmann Aug 22, 2024
190f081
Fix terraintessellation example
lucmann Aug 22, 2024
bdd0f69
Use vk::ResultValue<> to adapt the latest vulkan-sdk
lucmann Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/glfw/glfw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ vk::SurfaceKHR Window::createWindowSurface(GLFWwindow* window, const vk::Instanc
VkSurfaceKHR rawSurface;
vk::Result result =
static_cast<vk::Result>(glfwCreateWindowSurface((VkInstance)instance, window, reinterpret_cast<const VkAllocationCallbacks*>(pAllocator), &rawSurface));
return vk::createResultValue(result, rawSurface, "vk::CommandBuffer::begin");
return {vk::ResultValue<VkSurfaceKHR>(result, rawSurface).value};
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion examples/pipelinestatistics/pipelinestatistics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class VulkanExample : public vkx::ExampleBase {
// Retrieves the results of the pipeline statistics query submitted to the command buffer
void getQueryResults() {
uint32_t count = static_cast<uint32_t>(pipelineStats.size());
device.getQueryPoolResults<uint64_t>(queryPool, 0, 1, pipelineStats, sizeof(uint64_t), vk::QueryResultFlagBits::e64);
device.getQueryPoolResults(queryPool, 0, 1, count * sizeof(uint64_t), pipelineStats.data(), sizeof(uint64_t), vk::QueryResultFlagBits::e64);
}

void updateCommandBufferPreDraw(const vk::CommandBuffer& drawCmdBuffer) override {
Expand Down
3 changes: 2 additions & 1 deletion examples/terraintessellation/terraintessellation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ class VulkanExample : public vkx::ExampleBase {
// Retrieves the results of the pipeline statistics query submitted to the command buffer
void getQueryResults() {
// We use vkGetQueryResults to copy the results into a host visible buffer
device.getQueryPoolResults<uint64_t>(queryPool, 0, 1, pipelineStats, sizeof(uint64_t), vk::QueryResultFlagBits::e64);
uint32_t count = static_cast<uint32_t>(pipelineStats.size());
device.getQueryPoolResults(queryPool, 0, 1, count * sizeof(uint64_t), pipelineStats.data(), sizeof(uint64_t), vk::QueryResultFlagBits::e64);
}

void loadAssets() override {
Expand Down