Browse Source

fix undefined reference to vkGetAndroidHardwareBufferPropertiesANDROID, add android-29 shared ci (#4056)

tags/20220721
nihui GitHub 3 years ago
parent
commit
0ea7a672fa
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
  1. +5
    -0
      .github/workflows/android-armv8-gpu.yml
  2. +1
    -1
      src/allocator.cpp

+ 5
- 0
.github/workflows/android-armv8-gpu.yml View File

@@ -53,6 +53,11 @@ jobs:
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 --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:
runs-on: ubuntu-latest


+ 1
- 1
src/allocator.cpp View File

@@ -1984,7 +1984,7 @@ int VkAndroidHardwareBufferImageAllocator::init()
bufferProperties.sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID;
bufferProperties.pNext = &bufferFormatProperties;

ret = vkGetAndroidHardwareBufferPropertiesANDROID(vkdev->vkdevice(), hb, &bufferProperties);
ret = vkdev->vkGetAndroidHardwareBufferPropertiesANDROID(vkdev->vkdevice(), hb, &bufferProperties);
if (ret != VK_SUCCESS)
{
NCNN_LOGE("vkGetAndroidHardwareBufferPropertiesANDROID failed %d", ret);


Loading…
Cancel
Save