mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
Support Android hardware-buffer presentation over Wayland
This commit is contained in:
1 parent
e5ba165027
commit
6fb6cb83ab
12 files changed
+1135
-35
No files matched your search
@@ -0,0 +1,63 @@
|
||||
import os
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
|
||||
def vulkan_include_args():
|
||||
candidates = []
|
||||
for name in ("ANDROID_NDK_HOME", "ANDROID_NDK_ROOT"):
|
||||
if os.environ.get(name):
|
||||
candidates.append(Path(os.environ[name]))
|
||||
|
||||
android_home = os.environ.get("ANDROID_HOME")
|
||||
if android_home:
|
||||
ndk_root = Path(android_home) / "ndk"
|
||||
version = os.environ.get("NDK_VERSION")
|
||||
if version:
|
||||
candidates.append(ndk_root / version)
|
||||
if ndk_root.is_dir():
|
||||
candidates.extend(sorted(ndk_root.iterdir(), reverse=True))
|
||||
|
||||
for ndk in candidates:
|
||||
include = ndk / "toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include"
|
||||
if (include / "vulkan/vulkan.h").is_file():
|
||||
return ["-idirafter", str(include)]
|
||||
return []
|
||||
|
||||
|
||||
class VkExternalImageSyncTest(unittest.TestCase):
|
||||
def test_client_barrier_pair(self):
|
||||
compiler = shutil.which(os.environ.get("CC", "cc"))
|
||||
if not compiler:
|
||||
self.fail("A C compiler is required for the Vulkan image-sync regression test")
|
||||
|
||||
tests = Path(__file__).resolve().parent
|
||||
source = tests / "vk_external_image_sync_test.c"
|
||||
includes = tests.parents[1] / "app/src/main/cpp/waylandcomp/src"
|
||||
with tempfile.TemporaryDirectory(prefix="droiddeck-vk-sync-") as tmp:
|
||||
program = Path(tmp) / "vk-external-image-sync"
|
||||
command = [
|
||||
compiler,
|
||||
"-std=c11",
|
||||
"-Wall",
|
||||
"-Wextra",
|
||||
"-Werror",
|
||||
"-UNDEBUG",
|
||||
"-I",
|
||||
str(includes),
|
||||
*vulkan_include_args(),
|
||||
str(source),
|
||||
"-o",
|
||||
str(program),
|
||||
]
|
||||
built = subprocess.run(command, capture_output=True, text=True)
|
||||
self.assertEqual(built.returncode, 0, built.stdout + built.stderr)
|
||||
ran = subprocess.run([str(program)], capture_output=True, text=True, timeout=30)
|
||||
self.assertEqual(ran.returncode, 0, ran.stdout + ran.stderr)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,63 @@
|
||||
#include <assert.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "vk_external_image_sync.h"
|
||||
|
||||
static void check_external_pair(const struct vkp_external_client_barrier_pair *pair,
|
||||
VkImage image, uint32_t queue_family) {
|
||||
assert(pair->acquire.sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER);
|
||||
assert(pair->acquire.oldLayout == VK_IMAGE_LAYOUT_GENERAL);
|
||||
assert(pair->acquire.newLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
|
||||
assert(pair->acquire.srcQueueFamilyIndex == VK_QUEUE_FAMILY_FOREIGN_EXT);
|
||||
assert(pair->acquire.dstQueueFamilyIndex == queue_family);
|
||||
assert(pair->acquire.image == image);
|
||||
assert(pair->acquire.srcAccessMask == 0);
|
||||
assert(pair->acquire.dstAccessMask == VK_ACCESS_TRANSFER_READ_BIT);
|
||||
assert(pair->acquire.subresourceRange.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT);
|
||||
assert(pair->acquire.subresourceRange.baseMipLevel == 0);
|
||||
assert(pair->acquire.subresourceRange.levelCount == 1);
|
||||
assert(pair->acquire.subresourceRange.baseArrayLayer == 0);
|
||||
assert(pair->acquire.subresourceRange.layerCount == 1);
|
||||
|
||||
assert(pair->release.sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER);
|
||||
assert(pair->release.oldLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
|
||||
assert(pair->release.newLayout == VK_IMAGE_LAYOUT_GENERAL);
|
||||
assert(pair->release.srcQueueFamilyIndex == queue_family);
|
||||
assert(pair->release.dstQueueFamilyIndex == VK_QUEUE_FAMILY_FOREIGN_EXT);
|
||||
assert(pair->release.image == image);
|
||||
assert(pair->release.srcAccessMask == VK_ACCESS_MEMORY_READ_BIT);
|
||||
assert(pair->release.dstAccessMask == 0);
|
||||
assert(pair->release.subresourceRange.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT);
|
||||
assert(pair->release.subresourceRange.levelCount == 1);
|
||||
assert(pair->release.subresourceRange.layerCount == 1);
|
||||
}
|
||||
|
||||
int main(void) {
|
||||
const VkImage image = (VkImage)(uintptr_t)0x1234;
|
||||
const VkImage ahb_image = (VkImage)(uintptr_t)0x5678;
|
||||
const uint32_t queue_family = 7;
|
||||
struct vkp_external_client_barrier_pair generic, ahb;
|
||||
|
||||
assert(vkp_external_client_barrier_pair(image, queue_family, 1, 0, &generic));
|
||||
check_external_pair(&generic, image, queue_family);
|
||||
|
||||
/* AHardwareBuffer imports deliberately use the same client flags and lifecycle. */
|
||||
assert(vkp_external_client_barrier_pair(ahb_image, queue_family, 1, 0, &ahb));
|
||||
check_external_pair(&ahb, ahb_image, queue_family);
|
||||
|
||||
unsigned char untouched[sizeof(generic)];
|
||||
memset(&generic, 0xa5, sizeof(generic));
|
||||
memcpy(untouched, &generic, sizeof(generic));
|
||||
assert(!vkp_external_client_barrier_pair(image, queue_family, 0, 0, &generic));
|
||||
assert(memcmp(&generic, untouched, sizeof(generic)) == 0);
|
||||
assert(!vkp_is_external_client_image(0, 0));
|
||||
|
||||
memset(&generic, 0x5a, sizeof(generic));
|
||||
memcpy(untouched, &generic, sizeof(generic));
|
||||
assert(!vkp_external_client_barrier_pair(image, queue_family, 1, 1, &generic));
|
||||
assert(memcmp(&generic, untouched, sizeof(generic)) == 0);
|
||||
assert(!vkp_is_external_client_image(1, 1));
|
||||
assert(vkp_is_external_client_image(1, 0));
|
||||
return 0;
|
||||
}
|
||||
Reference in new issue
Block a user