diff --git a/BUILD.md b/BUILD.md index 69870638..d0a02a23 100644 --- a/BUILD.md +++ b/BUILD.md @@ -26,7 +26,15 @@ Note that you need [assimp](https://github.com/assimp/assimp) in order to compil ## [Android](android/) -Building on Android is done using [Android Studio](https://developer.android.com/studio/) (Google's own and free Android IDE) and requires a device that supports Vulkan. Please see the [Android readme](./android/README.md) for details on how to build and run the samples. +Building on Android is done using the [Gradle Build Tool](https://gradle.org/). Put the ```bin``` directory of it somewhere in your path and from the root of the repository run: + +``` +cd android +gradle assembleDebug +``` +This will build all samples and output the apks to ```android\examples\bin```. + +If you want to build and install on a connected device or emulator image, run ```gradle installDebug``` instead. ## [iOS and macOS](xcode/) diff --git a/android/README.md b/android/README.md deleted file mode 100644 index a9eb997d..00000000 --- a/android/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# Vulkan examples on Android - -## Device support -- **To run these examples you need a device with an Android image that suports Vulkan** -- Builds currently only support arm-v7, other architectures may be added later -- Basic gamepad support is available too (zoom and rotate) -- Basic touch control support (zoom, move, rotate, look) - -## Building - -### Requirements - -- [Android Studio](https://developer.android.com/studio/) -- [Android NDK](https://developer.android.com/ndk/downloads/) (r11b or higher) -- [Android SDK](https://developer.android.com/studio/index.html) - -### Update the asset pack - -During the Android build process, assets are copied over from the data folder, so it's important to make sure that a current version of the [asset pack](../data/README.md) has been downloaded and extracted. - -### Building the Examples - -Select **Import project** from the welcome screen (or from inside Android via **File->New**): - - - -Navigate to the **android** subfolder of this repository (should be higlighted with a gadle symbol): - - - -Select OK to start the import. - -**Note:** Initial import will take a while due to the number of examples. - -Once the import is done, the samples can be build, debugged and run from inside Android Studio just like any other Android project. - -**Note:** If you update the repository at a later point you may have to resync to have additional examples added to the Android Studio project (**File->Sync Project with Gradle files**). diff --git a/android/androidstudio01.jpg b/android/androidstudio01.jpg deleted file mode 100644 index 85ab4b84..00000000 Binary files a/android/androidstudio01.jpg and /dev/null differ diff --git a/android/androidstudio02.jpg b/android/androidstudio02.jpg deleted file mode 100644 index fe0b4e80..00000000 Binary files a/android/androidstudio02.jpg and /dev/null differ diff --git a/examples/pipelinestatistics/pipelinestatistics.cpp b/examples/pipelinestatistics/pipelinestatistics.cpp index 7e2fad3a..a46c7688 100644 --- a/examples/pipelinestatistics/pipelinestatistics.cpp +++ b/examples/pipelinestatistics/pipelinestatistics.cpp @@ -201,7 +201,7 @@ public: VkDeviceSize offsets[1] = { 0 }; // Start capture of pipeline statistics - vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, VK_QUERY_CONTROL_PRECISE_BIT); + vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, 0); vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline); vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, NULL); diff --git a/examples/terraintessellation/terraintessellation.cpp b/examples/terraintessellation/terraintessellation.cpp index 847e74dc..3b67c8e2 100644 --- a/examples/terraintessellation/terraintessellation.cpp +++ b/examples/terraintessellation/terraintessellation.cpp @@ -364,7 +364,7 @@ public: // Terrain if (deviceFeatures.pipelineStatisticsQuery) { // Begin pipeline statistics query - vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, VK_QUERY_CONTROL_PRECISE_BIT); + vkCmdBeginQuery(drawCmdBuffers[i], queryPool, 0, 0); } // Render vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, wireframe ? pipelines.wireframe : pipelines.terrain);