Snap for 5503058 from 6832185dea7b0705f96128e598bb138610f23385 to qt-release
Change-Id: I0deca772b9a5ff847fe16e50c9be1dab2216d6de
diff --git a/BUILD.gn b/BUILD.gn
index 5e63b19..385ae8d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,4 +1,4 @@
-source_set("goldfish_vulkan") {
+shared_library("vulkan_goldfish") {
sources = [
"android-emu/android/base/AlignedBuf.cpp",
"android-emu/android/base/AlignedBuf.h",
@@ -84,6 +84,8 @@
"-Wno-missing-field-initializers",
]
+ ldflags = [ "-static-libstdc++" ]
+
if (target_os == "fuchsia") {
sources += [ "fuchsia/port.cc" ]
diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index aace8e3..d39d99a 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -506,10 +506,6 @@
} else if (usage & GRALLOC_USAGE_HW_VIDEO_ENCODER) {
// Camera-to-encoder is NV21
format = HAL_PIXEL_FORMAT_YCrCb_420_SP;
- } else if ((usage & GRALLOC_USAGE_HW_CAMERA_MASK) ==
- GRALLOC_USAGE_HW_CAMERA_ZSL) {
- // Camera-to-ZSL-queue is RGB_888
- format = HAL_PIXEL_FORMAT_RGB_888;
}
}
@@ -545,11 +541,6 @@
glFormat = GL_RGBA;
glType = GL_UNSIGNED_BYTE;
break;
- case HAL_PIXEL_FORMAT_RGB_888:
- bpp = 3;
- glFormat = GL_RGB;
- glType = GL_UNSIGNED_BYTE;
- break;
case HAL_PIXEL_FORMAT_RGB_565:
bpp = 2;
// Workaround: distinguish vs the RGB8/RGBA8
diff --git a/system/vulkan/func_table.cpp b/system/vulkan/func_table.cpp
index 14c8c32..44e385d 100644
--- a/system/vulkan/func_table.cpp
+++ b/system/vulkan/func_table.cpp
@@ -1095,7 +1095,7 @@
}
static void entry_vkCmdSetBlendConstants(
VkCommandBuffer commandBuffer,
- const float blendConstants)
+ const float blendConstants[4])
{
AEMU_SCOPED_TRACE("vkCmdSetBlendConstants");
auto vkEnc = HostConnection::get()->vkEncoder();
diff --git a/system/vulkan/goldfish_vulkan.cpp b/system/vulkan/goldfish_vulkan.cpp
index 18a9424..3b38994 100644
--- a/system/vulkan/goldfish_vulkan.cpp
+++ b/system/vulkan/goldfish_vulkan.cpp
@@ -208,6 +208,8 @@
namespace {
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+
int OpenDevice(const hw_module_t* module, const char* id, hw_device_t** device);
hw_module_methods_t goldfish_vulkan_module_methods = {
@@ -232,6 +234,8 @@
return 0;
}
+#endif
+
#define VK_HOST_CONNECTION(ret) \
HostConnection *hostCon = HostConnection::get(); \
if (!hostCon) { \
@@ -498,6 +502,8 @@
return (PFN_vkVoidFunction)(goldfish_vk::goldfish_vulkan_get_instance_proc_address(instance, name));
}
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+
hwvulkan_device_t goldfish_vulkan_device = {
.common = {
.tag = HARDWARE_DEVICE_TAG,
@@ -517,7 +523,19 @@
if (strcmp(id, HWVULKAN_DEVICE_0) == 0) {
*device = &goldfish_vulkan_device.common;
+ goldfish_vk::ResourceTracker::get();
+ return 0;
+ }
+ return -ENOENT;
+}
+
+#endif
+
#ifdef VK_USE_PLATFORM_FUCHSIA
+
+class VulkanDevice {
+public:
+ VulkanDevice() {
goldfish_vk::ResourceTracker::get()->setColorBufferFunctions(
[](uint32_t width, uint32_t height, uint32_t format) {
VK_HOST_CONNECTION((uint32_t)0)
@@ -532,12 +550,29 @@
VK_HOST_CONNECTION()
rcEnc->rcCloseColorBuffer(rcEnc, id);
});
-#else
- goldfish_vk::ResourceTracker::get();
-#endif
- return 0;
}
- return -ENOENT;
+
+ static VulkanDevice& GetInstance() {
+ static VulkanDevice g_instance;
+ return g_instance;
+ }
+
+ PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const char* name) {
+ return ::GetInstanceProcAddr(instance, name);
+ }
+};
+
+extern "C" __attribute__((visibility("default"))) PFN_vkVoidFunction
+vk_icdGetInstanceProcAddr(VkInstance instance, const char* name) {
+ return VulkanDevice::GetInstance().GetInstanceProcAddr(instance, name);
}
+extern "C" __attribute__((visibility("default"))) VkResult
+vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) {
+ *pSupportedVersion = std::min(*pSupportedVersion, 3u);
+ return VK_SUCCESS;
+}
+
+#endif
+
} // namespace
diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp
index b97f120..42487ea 100644
--- a/system/vulkan_enc/VkEncoder.cpp
+++ b/system/vulkan_enc/VkEncoder.cpp
@@ -7137,7 +7137,7 @@
void VkEncoder::vkCmdSetBlendConstants(
VkCommandBuffer commandBuffer,
- const float blendConstants)
+ const float blendConstants[4])
{
AEMU_SCOPED_TRACE("vkCmdSetBlendConstants encode");
mImpl->log("start vkCmdSetBlendConstants");
diff --git a/system/vulkan_enc/VkEncoder.h b/system/vulkan_enc/VkEncoder.h
index 16df497..8328b32 100644
--- a/system/vulkan_enc/VkEncoder.h
+++ b/system/vulkan_enc/VkEncoder.h
@@ -473,7 +473,7 @@
float depthBiasSlopeFactor);
void vkCmdSetBlendConstants(
VkCommandBuffer commandBuffer,
- const float blendConstants);
+ const float blendConstants[4]);
void vkCmdSetDepthBounds(
VkCommandBuffer commandBuffer,
float minDepthBounds,