Skip to content

vulkan tutorial missing chapter #1

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.

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

Merged
merged 2 commits into from
May 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ set(SRC_DIR src/main/cpp)
set(VK_WRAPPER_DIR src/main/cpp/vulkan_wrapper)
set(VK_VAL_LAYER_SRC_DIR ${ANDROID_NDK}/sources/third_party/vulkan/src)
set(GLM_SRC_DIR src/main/cpp/glm)
set(STB_DIR src/main/cpp/stb)

add_library( # Sets the name of the library.
vulkan-tutorial
Expand All @@ -28,7 +29,7 @@ add_library( # Sets the name of the library.
${SRC_DIR}/vulkan_tutorial_jni.cpp
)

include_directories(${VK_WRAPPER_DIR} ${VK_VAL_LAYER_SRC_DIR}/include ${GLM_SRC_DIR})
include_directories(${VK_WRAPPER_DIR} ${VK_VAL_LAYER_SRC_DIR}/include ${GLM_SRC_DIR} ${STB_DIR})

# Searches for a specified prebuilt library and stores the path as a
# variable. Because CMake includes system libraries in the search path by
Expand Down
16 changes: 11 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ def ndkDir = properties.getProperty('ndk.dir')
def valLayerBinDir = "${ndkDir}/sources/third_party/vulkan/src/build-android/jniLibs"

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.0"
defaultConfig {
applicationId "com.github.piasy.vulkantutorial"
minSdkVersion 24
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -49,15 +49,20 @@ android {

externalNativeBuild {
cmake {
cppFlags "-frtti -fexceptions -std=c++11 -Werror -Wno-unused-variable " +
"-DUSE_DEBUG_EXTENTIONS -DVK_USE_PLATFORM_ANDROID_KHR"
cppFlags "-DUSE_DEBUG_EXTENTIONS -DVK_USE_PLATFORM_ANDROID_KHR"
}
}
}
release {
minifyEnabled false
signingConfig signingConfigs.debug
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

externalNativeBuild {
cmake {
cppFlags "-DVK_USE_PLATFORM_ANDROID_KHR"
}
}
}
}

Expand All @@ -69,5 +74,6 @@ android {
}

dependencies {
//noinspection GradleCompatible
compile 'com.android.support:appcompat-v7:25.3.1'
}
Binary file added app/src/main/assets/sample_tex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading