Commit graph

229 commits

Author SHA1 Message Date
Gadgeteer
2d2746c01d Remove xcode/examples.h 2023-07-19 16:19:15 +01:00
Sascha Willems
9dcc8110cf Renamed particle fire sample 2023-07-16 16:03:29 +02:00
Gadgeteer
b1d2777ad0 First Version of MacOS test 2023-07-15 10:44:22 +01:00
robotchaoX
71b5d83525 Set abiFilters via global variable in settings.gradle 2023-05-30 15:14:02 +08:00
robotchaoX
495b3eba96 Revert "Add x86_64 ABI support for Android"
This reverts commit 570d3fca81.
2023-05-30 13:59:20 +08:00
robotchaoX
570d3fca81 Add x86_64 ABI support for Android
[Why]
In some case, people may need x86 ABI version apk if they develop on x86 Android.
Support x86_64 ABI by default is better.

[How]
Add android::ndk::abiFilters property "x86_64".
2023-05-29 16:48:27 +08:00
robotchaoX
5e24e0ca15 Migrate jcenter to mavenCentral
[Why]
JFrog made JCenter a read-only repository on March 31, 2021.

[How]
Migrate JCenter to Maven Central.
Reference: https://developer.android.com/build/jcenter-migration
2023-05-29 16:48:27 +08:00
robotchaoX
9578a603e8 Increase the JVM heap size for Gradle
[Why]
The Java Virtual Machine(JVM) maximum heap size(-Xmx) is 512M by default. It will occur out of memory eror when compiling for Android.
Android compiling error: "java.lang.OutOfMemoryError: Java heap space".

[How]
Configure JVM memory for Gradle by setting Gradle property org.gradle.jvmargs in gradle.properties file.
This gradle.properties file was generated by Android Studio settings.

Reference:
https://developer.android.com/build/optimize-your-build?utm_source=android-studio#increase-the-jvm-heap-size
https://docs.gradle.org/7.2/userguide/build_environment.html#sec:configuring_jvm_memory
2023-05-29 16:48:27 +08:00
Sascha Willems
eb3d68fb5c Updated android build files to new asset/shader folder structure
Make use of global gradle variables
Updated gradle
2023-05-10 20:33:19 +02:00
Sascha Willems
3d7f4477d8 Use arm64-v8a abi for Android
Incrase jvm memory
2022-12-24 14:51:55 +01:00
Sascha Willems
280964b945 Added ray query samples android build files
Refs #1004
2022-12-24 12:32:18 +01:00
Sascha Willems
9eae567ee2 Update gradle build tools 2022-12-24 11:46:49 +01:00
Sascha Willems
704aeec6b0 Simplified glTF buffer code
Added Android build files
2022-01-22 10:03:39 +01:00
dinkovm
bf538e772f Missing shaders in Android Packages for raytracingshadows and raytracingreflections 2021-06-17 13:00:51 -04:00
Sascha Willems
0d732cc4a4
Merge pull request #782 from m0ppers/feature/use-gradlew
📝 use gradlew
2021-01-29 19:14:53 +01:00
Sascha Willems
b29d8dc589 Added descriptor indexing example android build files 2021-01-29 10:49:32 +01:00
Tamas Keri
f5d4cce55e Add missing gltf assets to 'build.gradle'
Vulkan applications: displacement, particlefire, pushconstants.
2021-01-07 12:48:41 +01:00
Andreas Streichardt
b4cf84a06e 📝 use gradlew 2020-11-26 07:38:06 +01:00
Sascha Willems
8f88155a72 Remove prebuilt lib 2020-08-22 09:23:46 +02:00
Sascha Willems
2083a9839c Added Android build files and screenshot for order independent transparency sample 2020-08-21 10:12:55 +02:00
Sascha Willems
ee946e2abf
Update ray tracing samples to use VK_KHR_ray_tracing (#753)
* Started updating ray tracing samples to KHR extension

* Updated GLSL shaders to use GL_EXT_ray_tracing

* Code cleanup, naming

* Fix include directories to use Vulkan headers from repository instead of NDK for the Android build

* Added new Android function pointers

* Renamed basic ray tracing sample

Added android build files

* Remove unused batch file

* Replaced remaining NV identifiers

* Updating ray tracing shadow sample to KHR extension

* Updated shaders to use KHR instead of NV extension

Fixed shader bindings

* Updating ray tracing reflections sample to KHR extension

* Renamed ray tracing reflections sample

* Renamed ray tracing shadows sample

Added android build files

* Removed no-longer used batch files for shader generation

* Proper alignment for the shader binding table

* Updated readme

* Reworked shader group setup

* Cleanup

* Reworked shader group setup

* Reworked shader group setup

* Code cleanup
2020-08-15 17:59:02 +02:00
Sascha Willems
feb939096f
Merge glTF branch (#747)
* Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class

* Split glTF loader into header and implementation

* Updated sample to use glTF

* Removed collada files

Replaced assets are now part of the asset pack

* Return value for glTF model vertex input state create info helper

* Removed unused assets

* Use glTF assets

* Added default material for glTF node's without materials

* Use glTF assets

* Apply pre-transforms to normals

* Use glTF assets

* Use glTF assets

* Use vertex input state from glTF model class

* Scene setup

* Use glTF assets

* Use glTF assets

* Display error message and exit if glTF file could not be loaded

* Use glTF assets

* Use glTF assets

* Use glTF assets

* Remove unused buffer binds

* Use glTF assets

* Remove no longer used model files

* Remove no longer used model files

* Added support for rendering glTF models with images

* glTF model normal pre-transform ignores translation

* Use glTF assets

* Use glTF assets

* Use glTF assets

* Use glTF assets

* Use glTF assets

* Only add combined image samplers to pool if actually used in the scene

* Use global descriptor set layouts

* Use global descriptor set layouts

* Use glTF assets

* Use glTF assets

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders

* Use glTF assets

Code cleanup

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders

* Remove no-longer used model

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders
Removed no-longer used model

* Use glTF assets

Code cleanup
Use RGBA texture instead of different compressed formats
Removed no-longer used assets

* Adnrdoid build file

* Use glTF assets

Code cleanup and refactoring
Updated GLSL and HLSL shaders

* Added vertex count and way of passing additional memory property type flags to glTF loader

* Use glTF assets

Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Updated GLSL and HLSL shaders

* Remove unfinished sample

* Completely reworked push constants sample

Use glTF assets
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Android CMake build files

* Removed un-used asset

* Explicit buffer binding function

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders

* Use glTF assets

Code cleanup

* Use glTF assets

Code cleanup
Removed no-longer used assets

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Remove no-longer used asset

* Use glTF assets

Code cleanup and refactoring
Performance optimizations
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring

* Use glTF assets

Code cleanup and refactoring

* Use glTF assets

Code cleanup and refactoring
Removed no-longer used assets

* Pass vertex size and calculate multiplier in shaders instead of hard-coding

With this, changes to the glTF vertex structure won't break the ray tracing samples

* Load tangents (if present)

* Use glTF assets

Code cleanup and heavy refactoring
Reworked debug display code

* Android build

* Normal mapping fixes

Udpated HLSL shaders

* Use glTF assets

Code cleanup and heavy refactoring
Reworked debug display code
Updated GLSL and HLSL shaders

* Code cleanup, comments

* Use glTF assets

Code cleanup and heavy refactoring
Reworked debug display code
Updated GLSL and HLSL shaders

* Added sample count to framebuffer create info

* Removed no-longer used assets

* Android build

Removed no-longer used assets

* Code cleanup and heavy refactoring

Updated GLSL and HLSL shaders
Use tangents stored in GLSL instead of calculating them in the fragment shader

* Renamed textured PBR sample main cpp file

* Use glTF assets

Code cleanup and refactoring
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Removed no-longer used assets

* Android build files

* Android build files

* Use glTF assets

Removed no-longer used assets

* Fixed HLSL shaders

* Android build files

* Use glTF assets

Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Updated GLSL and HLSL shaders
Removed no-longer used assets

* Added flag to disable glTF image loading

Useful for samples that use their own textures or don't use textures at all to speed up loading

* Use glTF assets

Code cleanup
Use Sponza scene instead of Sibenik to better highlight the effect
Updated GLSL and HLSL shaders

* Updated Android build files

* Removed left-over comment

* Use Sponza scene for the SSAO sample

* Removed unused code

* Removed ASSIMP

No longer required as all samples now use the glTF file format

* Added missing vertex shader stage

* Removed old ASSIMP-based model loader

* Added support for loading external glTF images from ktx

Android fixes for loading external buffer files

* Scene setup

* Added missing shader stages

* Removed ASSIMP from build files

* Fixed compiler warning

* Removed ASSIMP from readmes

* Android build files cleanup

* Replaced ktx submodule with only the files required for this repo

The ktx submodule was a tad too big and contained lots of files not required for this repo

* Moved ktx build files into base project

* Use glTF assets

* Use glTF assets

* Removed license files, will be moved to asset pack

* Use RGBA textures

* Use RGBA cubemp texture with face assignment based on original images

Refs #679

* Android build files

* Removed textures

All textures will be moved to the asset pack

* Ignore asset folders

* Removed font

Fonts will be moved to the asset pack

* Link to gltf asset pack

* Updated gitignore

* Android build file
2020-07-28 20:20:38 +02:00
Sascha Willems
dceb349849 Added cube map array sample 2020-07-19 07:07:54 +02:00
Sascha Willems
e370e6d169
Merge glTF scene rendering sample (#744)
* Started reworking the scene rendering to sample
Use glTF instead of ASSIMP, per-material pipelines, material loading, etc.

* Visibility toggle for scene nodes

* Fixed lighting, updated GLSL and HLSL shaders

* Renamed sample

* Code-Cleanup, comments, validation fixes

* Android build

* Started on tutorial for glTF scene rendering sample

* Minor code cleanup

* Adding new chapters to the tutorial for glTF scene rendering sample

* Added info on normal map shader bindings, spelling

* Added drawing chapter

* Getter for texture descriptors

Makes code a easier to read

* Renamed glTF scene sample

* Add markdown files to projects

* Updated readme, separate chapter for glTF samples

* Comments

* Removed unused screenshot
2020-07-04 14:20:45 +02:00
Sascha Willems
cb0633550f Adnroid build 2020-06-06 13:52:45 +02:00
Sascha Willems
05a9c23220 Android build files 2020-06-06 11:28:50 +02:00
Sascha Willems
d4f7b3cc86 Merge branch 'master' into gltfskinning 2020-06-05 20:58:10 +02:00
Ben Clayton
ca884587a4 Move shaders into glsl and hlsl directories
Move `data/shaders` to `data/shaders/glsl`
Move `data/hlsl` to `data/shaders/hlsl`

Fix up shader paths in the cpp files to point to the new glsl location.

`data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for
now).

Issue: #723
2020-06-01 12:22:28 +01:00
Sascha Willems
b5e0c562ff Added Android build files for glTF skinning sample 2020-05-24 13:42:52 +02:00
Sascha Willems
10a1ecaf7b Re-Added missing shaders
Fixes #703
2020-04-29 18:39:15 +02:00
Sascha Willems
b47e5ada7c
Merge pull request #680 from hevrard/fix-packagename
Fix typo in package name vulkanDeferredmultisampling
2020-04-23 07:43:27 +02:00
Sascha Willems
e0c15f62da Renamed mesh example to glTF scene 2020-04-19 11:50:46 +02:00
Hugues Evrard
ca728afa3a Fix typo in package name vulkanDeferredmultisampling 2020-03-05 14:49:01 +00:00
Sascha Willems
79998b4851 Merge branch 'master' into libktx 2019-09-13 21:52:19 +02:00
Sascha Willems
ee354a2fbe Updated Android build instructions 2019-09-06 20:42:05 +02:00
Sascha Willems
d33fc23e0b Merge branch 'master' into libktx 2019-09-06 19:20:35 +02:00
Sascha Willems
36bf3dd31a Removed remaining dds files
All textures are now loaded from ktx
2019-09-06 19:18:15 +02:00
Sascha Willems
a6d9b57d7c Merge branch 'master' into libktx 2019-08-05 07:21:30 +02:00
Sascha Willems
c3f1692486 Updated Android build filed for Gradle 5.x
Fixes #597
2019-08-04 13:48:09 +02:00
Sascha Willems
b3be81cf98 Add libktx to android base library cmake 2019-08-03 11:37:47 +02:00
Sascha Willems
b2add91d2c Renamed compute shader ray tracing example 2019-05-11 12:41:46 +02:00
Sascha Willems
48a1e40000 Added negative viewport height example Android build files 2019-03-29 14:11:00 +01:00
Sascha Willems
a1ab86cc90 Updated Android gradle version 2019-03-29 14:10:35 +01:00
Philip Rideout
c00ede2978 Fix Android build error.
The latest version of Android Studio fails with:

    Could not find com.android.tools.build:aapt2

To use AAPT2, we must now have a dependency on the `google()` repo
in both places in the root build.gradle file, as per:

    https://developer.android.com/studio/releases/#aapt2_gmaven
2019-02-04 10:55:59 -08:00
Sascha Willems
d782d4c15e Added multiview and inlineuniformblocks sample to android build 2018-12-08 18:50:25 +01:00
saschawillems
d952eb5eaf Android ImGui CMake changes
Refs #496
2018-09-07 16:03:36 +02:00
saschawillems
1de1b9e568 Multiple frame buffer attachments (one per swapchain image) 2018-07-19 15:07:41 +02:00
saschawillems
0fb88d5467 Different scene, toon shading and separate parameters for color input attachment 2018-07-19 11:01:15 +02:00
saschawillems
bdb9af7ef7 Android build files for input attachments example 2018-07-17 20:38:20 +02:00
Sascha Willems
d52f5991ed
Merge pull request #483 from sjfricke/missing-assets
fixed android asset gradles
2018-05-12 08:34:56 +02:00