From 5f71b5b3ec251b90fcc4e34e5c59a571d49ed845 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 24 Jan 2016 12:19:04 +0100 Subject: [PATCH] Android: Vulkan builds but doesn't link as we have no link library. --- GPU/Vulkan/ShaderManagerVulkan.cpp | 2 ++ GPU/Vulkan/TextureCacheVulkan.cpp | 2 +- android/jni/Android.mk | 21 +++++++++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp index 0bf47a6743..36de452533 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.cpp +++ b/GPU/Vulkan/ShaderManagerVulkan.cpp @@ -60,9 +60,11 @@ VulkanFragmentShader::VulkanFragmentShader(VulkanContext *vulkan, ShaderID id, c } ERROR_LOG(G3D, "Messages: %s", errorMessage.c_str()); ERROR_LOG(G3D, "Shader source:\n%s", code); +#ifdef SHADERLOG OutputDebugStringA("Messages:\n"); OutputDebugStringA(errorMessage.c_str()); OutputDebugStringA(code); +#endif Reporting::ReportMessage("Vulkan error in shader compilation: info: %s / code: %s", errorMessage.c_str(), code); } else { success = vulkan_->CreateShaderModule(spirv, &module_); diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index c3f88db497..8bfc89f90e 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -1445,7 +1445,7 @@ void TextureCacheVulkan::SetTexture() { // Ready or not, here I go... if (replaceImages) { if (!entry->vkTex) { - DebugBreak(); + Crash(); } } else { entry->vkTex = new CachedTextureVulkan(); diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 32c9b991ee..04ad94d17f 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -124,9 +124,28 @@ EGL_FILES := \ $(SRC)/Common/GL/GLInterface/EGLAndroid.cpp \ $(SRC)/Common/GL/GLInterface/GLInterface.cpp +# Only build Vulkan on ARM64 for now. +ifeq ($(TARGET_ARCH_ABI),arm64-v8a) +VULKAN_FILES := \ + $(SRC)/GPU/Vulkan/FragmentShaderGeneratorVulkan.cpp \ + $(SRC)/GPU/Vulkan/DrawEngineVulkan.cpp \ + $(SRC)/GPU/Vulkan/FramebufferVulkan.cpp \ + $(SRC)/GPU/Vulkan/GPU_Vulkan.cpp \ + $(SRC)/GPU/Vulkan/PipelineManagerVulkan.cpp \ + $(SRC)/GPU/Vulkan/ShaderManagerVulkan.cpp \ + $(SRC)/GPU/Vulkan/StateMappingVulkan.cpp \ + $(SRC)/GPU/Vulkan/TextureCacheVulkan.cpp \ + $(SRC)/GPU/Vulkan/TextureScalerVulkan.cpp \ + $(SRC)/GPU/Vulkan/DepalettizeShaderVulkan.cpp \ + $(SRC)/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp +else +VULKAN_FILES := +endif + EXEC_AND_LIB_FILES := \ $(ARCH_FILES) \ $(EGL_FILES) \ + $(VULKAN_FILES) \ TestRunner.cpp \ $(SRC)/Core/MIPS/MIPS.cpp.arm \ $(SRC)/Core/MIPS/MIPSAnalyst.cpp \ @@ -209,8 +228,6 @@ EXEC_AND_LIB_FILES := \ $(SRC)/GPU/GLES/FragmentShaderGenerator.cpp.arm \ $(SRC)/GPU/GLES/FragmentTestCache.cpp.arm \ $(SRC)/GPU/GLES/TextureScaler.cpp \ - $(SRC)/GPU/Vulkan/FramebufferVulkan.cpp \ - $(SRC)/GPU/Vulkan/GPU_Vulkan.cpp \ $(SRC)/GPU/Null/NullGpu.cpp \ $(SRC)/GPU/Software/Clipper.cpp \ $(SRC)/GPU/Software/Lighting.cpp \