claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #681 from krOoze/triangle_dependencies

Browse source 
Tweak Triangle subpass dependencies
This commit is contained in:
Sascha Willems 2020-04-01 18:15:30 +02:00 • committed by GitHub
commit 78b25ebd71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 81 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

16
base/vulkanexamplebase.cpp
View file

@ -881,7 +881,7 @@ bool VulkanExampleBase::initVulkan()
{
char* endptr;
uint32_t index = strtol(args[i + 1], &endptr, 10);
if (endptr != args[i + 1])
if (endptr != args[i + 1])
{
if (index > gpuCount - 1)
{
@ -900,11 +900,11 @@ bool VulkanExampleBase::initVulkan()
{
uint32_t gpuCount = 0;
VK_CHECK_RESULT(vkEnumeratePhysicalDevices(instance, &gpuCount, nullptr));
if (gpuCount == 0)
if (gpuCount == 0)
{
std::cerr << "No Vulkan devices found!" << std::endl;
}
else
else
{
// Enumerate devices
std::cout << "Available Vulkan devices" << std::endl;
@ -984,7 +984,7 @@ bool VulkanExampleBase::initVulkan()
androidProduct += std::string(prop);
};
LOGD("androidProduct = %s", androidProduct.c_str());
#endif
#endif
return true;
}
@ -1329,13 +1329,13 @@ int32_t VulkanExampleBase::handleAppInput(struct android_app* app, AInputEvent*
vulkanExample->mousePos.x = AMotionEvent_getX(event, 0);
vulkanExample->mousePos.y = AMotionEvent_getY(event, 0);
break;
}
}
case AMOTION_EVENT_ACTION_MOVE: {
bool handled = false;
if (vulkanExample->settings.overlay) {
ImGuiIO& io = ImGui::GetIO();
handled = io.WantCaptureMouse;
}
}
if (!handled) {
int32_t eventX = AMotionEvent_getX(event, 0);
int32_t eventY = AMotionEvent_getY(event, 0);
@ -1940,7 +1940,7 @@ void VulkanExampleBase::handleEvent(const xcb_generic_event_t *event)
if (settings.overlay) {
settings.overlay = !settings.overlay;
}
break;
break;
}
}
break;
@ -1960,7 +1960,7 @@ void VulkanExampleBase::handleEvent(const xcb_generic_event_t *event)
break;
case KEY_D:
camera.keys.right = false;
break;
break;
case KEY_ESCAPE:
quit = true;
break;

5
base/vulkanexamplebase.h
View file

@ -56,7 +56,7 @@
class VulkanExampleBase
{
private:
private:
// Get window title with example name, device, et.
std::string getWindowTitle();
/** brief Indicates that the view (position, rotation) has changed and buffers containing camera matrices need to be updated */
@ -182,8 +182,7 @@ public:
std::string name = "vulkanExample";
uint32_t apiVersion = VK_API_VERSION_1_0;
struct
{
struct {
VkImage image;
VkDeviceMemory mem;
VkImageView view;