Completed Vulkan enabling on Android (closed DiligentGraphics/DiligentCore#33)

TheMostDiligent · TheMostDiligent · commit 352bd8e7e0e6 · 2020-04-26T21:14:38.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,46 +1,2 @@
-*.sdf
-*.opensdf
-*.tlog
-*.lastbuildstate
-*.idb
-*.manifest
-*.user
-*.suo
-*.ipch
-*.o
-*.a
-*.aps
-*.ilk
-*.pdb
-*.dll
-*.exp
-*.lib
-*.iobj
-*.ipdb
-*.db
-libs
-obj
-VisualGDBCache
-bin
-ARM
-gen
-tmp
-*.log
-*.mk.old
-*.opendb
-local.properties
-project.properties
-proguard-project.txt
-html
-doc/latex
-*.obj
-Debug
-Release
-/cmk_build
-/build
-*.db-shm
-*.db-wal
-*.vspx
-*.VC.db
-*.VC.VC.opendb
+build
 .vs
diff --git a/DiligentCore b/DiligentCore
@@ -1 +1 @@
-Subproject commit c7350b803946e2af3b605a87ede721b0e3bd5c88
+Subproject commit 7cd048118128174c39e1c4753fa0c4d608ac729b
diff --git a/DiligentSamples b/DiligentSamples
@@ -1 +1 @@
-Subproject commit 6100c6da1bbde90ab168d44926f60d2260ffad3d
+Subproject commit 019026e4f9a94a3559b32d374d81bdd8e06a4b51
diff --git a/DiligentTools b/DiligentTools
@@ -1 +1 @@
-Subproject commit a443255ac6ea8057c4deb6d1fd804b724a31c2f4
+Subproject commit a3ce5f65072388091995d72d40c40246588c54e9
diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ It is distributed under [Apache 2.0 license](License.txt) and is free to use.
 | <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/windows-logo.png" width=24 valign="middle"> Win32 (Windows desktop)| Direct3D11, Direct3D12, OpenGL4.2+, Vulkan     | [![Build Status](https://ci.appveyor.com/api/projects/status/github/DiligentGraphics/DiligentEngine?svg=true)](https://ci.appveyor.com/project/DiligentGraphics/diligentengine) |
 | <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/uwindows-logo.png" width=24 valign="middle"> Universal Windows     | Direct3D11, Direct3D12                         | [![Build Status](https://ci.appveyor.com/api/projects/status/github/DiligentGraphics/DiligentEngine?svg=true)](https://ci.appveyor.com/project/DiligentGraphics/diligentengine) |
 | <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/linux-logo.png" width=24 valign="middle"> Linux                    | OpenGL4.2+, Vulkan                             | [![Build Status](https://travis-ci.org/DiligentGraphics/DiligentEngine.svg?branch=master)](https://travis-ci.org/DiligentGraphics/DiligentEngine)      |
-| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/android-logo.png" width=24 valign="middle"> Android                | OpenGLES3.0+                                   |																																					    |
+| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/android-logo.png" width=24 valign="middle"> Android                | OpenGLES3.0+, Vulkan                           |																																					    |
 | <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/macos-logo.png" width=24 valign="middle"> MacOS                    | OpenGL4.1, Vulkan (via [MoltenVK](https://github.com/KhronosGroup/MoltenVK)) | [![Build Status](https://travis-ci.org/DiligentGraphics/DiligentEngine.svg?branch=master)](https://travis-ci.org/DiligentGraphics/DiligentEngine) |
 | <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/apple-logo.png" width=24 valign="middle"> iOS                      | OpenGLES3.0, Vulkan (via [MoltenVK](https://github.com/KhronosGroup/MoltenVK)) | [![Build Status](https://travis-ci.org/DiligentGraphics/DiligentEngine.svg?branch=master)](https://travis-ci.org/DiligentGraphics/DiligentEngine)      |
 
@@ -267,11 +267,21 @@ Please make sure that your machine is set up for Android development. Download
 and other required tools. If you are not using CMake version bundled with Android Studio, make sure
 your build files are [properly configured](https://developer.android.com/studio/projects/add-native-code.html#use_a_custom_cmake_version).
 To verify that your environment is properly set up, try building the
-[teapots sample](https://github.com/googlesamples/android-ndk/tree/master/teapots).
+[teapots sample](https://github.com/googlesamples/android-ndk/tree/master/teapots) as well as
+[Vulkan Android tutorials](https://github.com/googlesamples/android-vulkan-tutorials).
+
+Known issues:
+
+* If native build does not find python executable, add `PYTHON_EXECUTABLE` variable to [CMake arguments in NativeApp's
+  build.gradle file](https://github.com/DiligentGraphics/DiligentTools/blob/master/NativeApp/Android/build.gradle#L12):
+  `-DPYTHON_EXECUTABLE=/Path/To/Your/Python36/python.exe`
+* If native build messes up shader_list.h file, go to git and undo the changes.
 
 Open *DiligentSamples/Android* or *UnityPlugin/Android* folders with Android Studio to build and run
 the engine samples and Unity emulator on Android.
 
+By default, appplications will run in OpenGLES mode. To run them in Vulkan mode, add the following launch flags:
+`--es mode vk` (in Android Studio, go to Run->Edit Configurations menu)
 
 <a name="build_and_run_macos"></a>
 ## MacOS
diff --git a/unityplugin/GhostCubePlugin/UnityProject/.gitignore b/unityplugin/GhostCubePlugin/UnityProject/.gitignore
@@ -1,3 +1,4 @@
 Library
 Temp
-build
+build
+Logs
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
@@ -41,9 +41,9 @@ class ProxySwapChainD3D11 : public SwapChainBase<ISwapChainD3D11>
         UNEXPECTED("Present is not expected to be called directly");
     }
 
-    virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight) override final
+    virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight, SURFACE_TRANSFORM NewPreTransform) override final
     {
-        TBase::Resize(NewWidth, NewHeight, 0);
+        TBase::Resize(NewWidth, NewHeight, NewPreTransform, 0);
     }
 
     void ReleaseViews()
@@ -150,7 +150,7 @@ void DiligentGraphicsAdapterD3D11::PostSwapChainResize()
 {
     auto* GraphicsD3D11Impl    = m_UnityGraphicsD3D11.GetGraphicsImpl();
     auto* pProxySwapChainD3D11 = m_pProxySwapChain.RawPtr<ProxySwapChainD3D11>();
-    pProxySwapChainD3D11->Resize(GraphicsD3D11Impl->GetBackBufferWidth(), GraphicsD3D11Impl->GetBackBufferHeight());
+    pProxySwapChainD3D11->Resize(GraphicsD3D11Impl->GetBackBufferWidth(), GraphicsD3D11Impl->GetBackBufferHeight(), SURFACE_TRANSFORM_OPTIMAL);
     pProxySwapChainD3D11->CreateViews(GraphicsD3D11Impl->GetRTV(), GraphicsD3D11Impl->GetDSV());
 }
 
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
@@ -125,9 +125,9 @@ class ProxySwapChainD3D12 : public SwapChainBase<ISwapChainD3D12>
         UNEXPECTED("Windowed mode cannot be set through the proxy swap chain");
     }
 
-    virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight) override final
+    virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight, SURFACE_TRANSFORM NewPreTransform) override final
     {
-        TBase::Resize(NewWidth, NewHeight, 0);
+        TBase::Resize(NewWidth, NewHeight, NewPreTransform, 0);
     }
 
     void ReleaseBuffers()
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
@@ -48,9 +48,9 @@ class ProxySwapChainGL : public SwapChainBase<ISwapChainGL>
         UNEXPECTED("Windowed mode cannot be set through the proxy swap chain");
     }
 
-    virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight)override final
+    virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight, SURFACE_TRANSFORM NewPreTransform)override final
     {
-        if (TBase::Resize(NewWidth, NewHeight, 0))
+        if (TBase::Resize(NewWidth, NewHeight, NewPreTransform))
         {
             CreateDummyBuffers();
         }
@@ -145,7 +145,7 @@ void DiligentGraphicsAdapterGL::BeginFrame()
     auto *UnityGraphicsGLImpl = m_UnityGraphicsGL.GetGraphicsImpl();
     Uint32 Width = UnityGraphicsGLImpl->GetBackBufferWidth();
     Uint32 Height = UnityGraphicsGLImpl->GetBackBufferHeight();
-    m_pProxySwapChain.RawPtr<ProxySwapChainGL>()->Resize(Width, Height);
+    m_pProxySwapChain.RawPtr<ProxySwapChainGL>()->Resize(Width, Height, SURFACE_TRANSFORM_OPTIMAL);
 }
     
 void DiligentGraphicsAdapterGL::EndFrame()

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 Library
 Temp
 -build
 +build
 +Logs
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ class ProxySwapChainD3D11 : public SwapChainBase<ISwapChainD3D11>`
`41`	`41`	`UNEXPECTED("Present is not expected to be called directly");`
`42`	`42`	`}`
`43`	`43`
`44`		`- virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight) override final`
	`44`	`+ virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight, SURFACE_TRANSFORM NewPreTransform) override final`
`45`	`45`	`{`
`46`		`- TBase::Resize(NewWidth, NewHeight, 0);`
	`46`	`+ TBase::Resize(NewWidth, NewHeight, NewPreTransform, 0);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void ReleaseViews()`
`@@ -150,7 +150,7 @@ void DiligentGraphicsAdapterD3D11::PostSwapChainResize()`
`150`	`150`	`{`
`151`	`151`	`auto* GraphicsD3D11Impl = m_UnityGraphicsD3D11.GetGraphicsImpl();`
`152`	`152`	`auto* pProxySwapChainD3D11 = m_pProxySwapChain.RawPtr<ProxySwapChainD3D11>();`
`153`		`- pProxySwapChainD3D11->Resize(GraphicsD3D11Impl->GetBackBufferWidth(), GraphicsD3D11Impl->GetBackBufferHeight());`
	`153`	`+ pProxySwapChainD3D11->Resize(GraphicsD3D11Impl->GetBackBufferWidth(), GraphicsD3D11Impl->GetBackBufferHeight(), SURFACE_TRANSFORM_OPTIMAL);`
`154`	`154`	`pProxySwapChainD3D11->CreateViews(GraphicsD3D11Impl->GetRTV(), GraphicsD3D11Impl->GetDSV());`
`155`	`155`	`}`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,9 @@ class ProxySwapChainD3D12 : public SwapChainBase<ISwapChainD3D12>`
`125`	`125`	`UNEXPECTED("Windowed mode cannot be set through the proxy swap chain");`
`126`	`126`	`}`
`127`	`127`
`128`		`- virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight) override final`
	`128`	`+ virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight, SURFACE_TRANSFORM NewPreTransform) override final`
`129`	`129`	`{`
`130`		`- TBase::Resize(NewWidth, NewHeight, 0);`
	`130`	`+ TBase::Resize(NewWidth, NewHeight, NewPreTransform, 0);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`void ReleaseBuffers()`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ class ProxySwapChainGL : public SwapChainBase<ISwapChainGL>`
`48`	`48`	`UNEXPECTED("Windowed mode cannot be set through the proxy swap chain");`
`49`	`49`	`}`
`50`	`50`
`51`		`- virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight)override final`
	`51`	`+ virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight, SURFACE_TRANSFORM NewPreTransform)override final`
`52`	`52`	`{`
`53`		`- if (TBase::Resize(NewWidth, NewHeight, 0))`
	`53`	`+ if (TBase::Resize(NewWidth, NewHeight, NewPreTransform))`
`54`	`54`	`{`
`55`	`55`	`CreateDummyBuffers();`
`56`	`56`	`}`
`@@ -145,7 +145,7 @@ void DiligentGraphicsAdapterGL::BeginFrame()`
`145`	`145`	`auto *UnityGraphicsGLImpl = m_UnityGraphicsGL.GetGraphicsImpl();`
`146`	`146`	`Uint32 Width = UnityGraphicsGLImpl->GetBackBufferWidth();`
`147`	`147`	`Uint32 Height = UnityGraphicsGLImpl->GetBackBufferHeight();`
`148`		`- m_pProxySwapChain.RawPtr<ProxySwapChainGL>()->Resize(Width, Height);`
	`148`	`+ m_pProxySwapChain.RawPtr<ProxySwapChainGL>()->Resize(Width, Height, SURFACE_TRANSFORM_OPTIMAL);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`void DiligentGraphicsAdapterGL::EndFrame()`