| @@ -53,6 +53,11 @@ jobs: | |||||
| mkdir build-android-29 && cd build-android-29 | mkdir build-android-29 && cd build-android-29 | ||||
| cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-29 -DNCNN_VULKAN=ON .. | cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-29 -DNCNN_VULKAN=ON .. | ||||
| cmake --build . -j 2 | cmake --build . -j 2 | ||||
| - name: build-android-29-shared | |||||
| run: | | |||||
| mkdir build-android-29-shared && cd build-android-29-shared | |||||
| cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-29 -DNCNN_VULKAN=ON -DNCNN_SHARED_LIB=ON .. | |||||
| cmake --build . -j 2 | |||||
| android-aarch64-gpu-ndk-r16b: | android-aarch64-gpu-ndk-r16b: | ||||
| runs-on: ubuntu-latest | runs-on: ubuntu-latest | ||||
| @@ -1984,7 +1984,7 @@ int VkAndroidHardwareBufferImageAllocator::init() | |||||
| bufferProperties.sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID; | bufferProperties.sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID; | ||||
| bufferProperties.pNext = &bufferFormatProperties; | bufferProperties.pNext = &bufferFormatProperties; | ||||
| ret = vkGetAndroidHardwareBufferPropertiesANDROID(vkdev->vkdevice(), hb, &bufferProperties); | |||||
| ret = vkdev->vkGetAndroidHardwareBufferPropertiesANDROID(vkdev->vkdevice(), hb, &bufferProperties); | |||||
| if (ret != VK_SUCCESS) | if (ret != VK_SUCCESS) | ||||
| { | { | ||||
| NCNN_LOGE("vkGetAndroidHardwareBufferPropertiesANDROID failed %d", ret); | NCNN_LOGE("vkGetAndroidHardwareBufferPropertiesANDROID failed %d", ret); | ||||