Android support for texture example (#97)

This commit is contained in:
saschawillems 2016-03-21 22:41:27 +01:00
parent 3ce7c0a96a
commit 786e43384d
2 changed files with 52 additions and 28 deletions

View file

@ -25,10 +25,6 @@
#include <vulkan/vulkan.h>
#include "vulkanexamplebase.h"
#ifdef __ANDROID__
#include "vulkanandroid.h"
#endif
#define VERTEX_BUFFER_BIND_ID 0
// Set to "true" to enable Vulkan's validation layers
// See vulkandebug.cpp for details
@ -871,7 +867,7 @@ public:
VulkanExample *vulkanExample;
#ifdef _WIN32
#if defined(_WIN32)
LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
if (vulkanExample != NULL)
@ -880,12 +876,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
}
return (DefWindowProc(hWnd, uMsg, wParam, lParam));
}
#endif
#ifdef __linux__
#ifdef __ANDROID__
// todo : android event handling
#else
#elif defined(__linux__) && !defined(__ANDROID__)
static void handleEvent(const xcb_generic_event_t *event)
{
if (vulkanExample != NULL)
@ -894,7 +885,6 @@ static void handleEvent(const xcb_generic_event_t *event)
}
}
#endif
#endif
// Main entry point
#if defined(_WIN32)