version 2.4.0

Author: Sean Lu(呂祥榮)

com.htc.upm.vive.openxr/Editor/CompositionLayer/Scripts/CompositionLayerEditor.cs

@@ -67,6 +67,18 @@ public class CompositionLayerEditor : Editor
 		static GUIContent Label_AngleOfArc = new GUIContent("Arc Angle", "Central angle of arc of Cylinder Layer");
 		SerializedProperty Property_AngleOfArc;
 
+		static string PropertyName_isExternalSurface = "isExternalSurface";
+		static GUIContent Label_isExternalSurface = new GUIContent("External Surface", "Specify using external surface or not.");
+		SerializedProperty Property_isExternalSurface;
+
+		static string PropertyName_ExternalSurfaceWidth = "externalSurfaceWidth";
+		static GUIContent Label_ExternalSurfaceWidth = new GUIContent("Width");
+		SerializedProperty Property_ExternalSurfaceWidth;
+
+		static string PropertyName_ExternalSurfaceHeight = "externalSurfaceHeight";
+		static GUIContent Label_ExternalSurfaceHeight = new GUIContent("Height");
+		SerializedProperty Property_ExternalSurfaceHeight;
+
 		static string PropertyName_IsDynamicLayer = "isDynamicLayer";
 		static GUIContent Label_IsDynamicLayer = new GUIContent("Dynamic Layer", "Specify whether Layer needs to be updated each frame or not.");
 		SerializedProperty Property_IsDynamicLayer;
@@ -101,9 +113,10 @@ public class CompositionLayerEditor : Editor
 		SerializedProperty Property_TrackingOrigin;
 
 		private bool showLayerParams = true, showColorScaleBiasParams = true;
-#pragma warning disable
+
 		private bool showExternalSurfaceParams = false;
-#pragma warning restore
+
+
 		public override void OnInspectorGUI()
 		{
 			if (Property_LayerType == null) Property_LayerType = serializedObject.FindProperty(PropertyName_LayerType);
@@ -117,6 +130,9 @@ public override void OnInspectorGUI()
 			if (Property_CylinderArcLength == null) Property_CylinderArcLength = serializedObject.FindProperty(PropertyName_CylinderArcLength);
 			if (Property_CylinderRadius == null) Property_CylinderRadius = serializedObject.FindProperty(PropertyName_CylinderRadius);
 			if (Property_AngleOfArc == null) Property_AngleOfArc = serializedObject.FindProperty(PropertyName_AngleOfArc);
+			if (Property_isExternalSurface == null) Property_isExternalSurface = serializedObject.FindProperty(PropertyName_isExternalSurface);
+			if (Property_ExternalSurfaceWidth == null) Property_ExternalSurfaceWidth = serializedObject.FindProperty(PropertyName_ExternalSurfaceWidth);
+			if (Property_ExternalSurfaceHeight == null) Property_ExternalSurfaceHeight = serializedObject.FindProperty(PropertyName_ExternalSurfaceHeight);
 			if (Property_IsDynamicLayer == null) Property_IsDynamicLayer = serializedObject.FindProperty(PropertyName_IsDynamicLayer);
 			if (Property_ApplyColorScaleBias == null) Property_ApplyColorScaleBias = serializedObject.FindProperty(PropertyName_ApplyColorScaleBias);
 			if (Property_SolidEffect == null) Property_SolidEffect = serializedObject.FindProperty(PropertyName_SolidEffect);
@@ -436,6 +452,25 @@ public override void OnInspectorGUI()
 			EditorGUILayout.PropertyField(Property_IsDynamicLayer, Label_IsDynamicLayer);
 			serializedObject.ApplyModifiedProperties();
 
+			//EditorGUILayout.PropertyField(Property_isExternalSurface, Label_isExternalSurface);
+			//serializedObject.ApplyModifiedProperties();
+
+			//if (targetCompositionLayer.isExternalSurface)
+			if (false)
+			{
+				EditorGUI.indentLevel++;
+				showExternalSurfaceParams = EditorGUILayout.Foldout(showExternalSurfaceParams, "External Surface Parameters");
+				if (showExternalSurfaceParams)
+				{
+					EditorGUILayout.PropertyField(Property_ExternalSurfaceWidth, Label_ExternalSurfaceWidth);
+					EditorGUILayout.PropertyField(Property_ExternalSurfaceHeight, Label_ExternalSurfaceHeight);
+					EditorGUILayout.PropertyField(Property_IsProtectedSurface, Label_IsProtectedSurface);
+
+					serializedObject.ApplyModifiedProperties();
+				}
+				EditorGUI.indentLevel--;
+			}
+
 			EditorGUILayout.PropertyField(Property_ApplyColorScaleBias, Label_ApplyColorScaleBias);
 			serializedObject.ApplyModifiedProperties();
 

com.htc.upm.vive.openxr/Runtime/Android/arm64/libviveopenxr.so

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93cb5f5a51d9ab068989c656cadf5173ad9e2f01ea730a88b962b290c7146020
-size 305152
+oid sha256:c5bcb67b079fa79a7d0e26e07c7d8a5ebdf4620e26c02707297a9922fccef546
+size 349840

com.htc.upm.vive.openxr/Runtime/CompositionLayer/Scripts/CompositionLayer.cs

@@ -96,6 +96,17 @@ public class CompositionLayer : MonoBehaviour
 		[SerializeField]
 		public bool isDynamicLayer = false;
 
+		[SerializeField]
+		public bool isExternalSurface = false;
+
+		[Tooltip("Width of external surface in pixels.")]
+		[SerializeField]
+		public uint externalSurfaceWidth = 1280;
+
+		[Tooltip("Height of external surface in pixels.")]
+		[SerializeField]
+		public uint externalSurfaceHeight = 720;
+
 		[SerializeField]
 		public bool applyColorScaleBias = false;
 
@@ -187,6 +198,58 @@ private bool CompositionLayerInit()
 				return true;
 			}
 
+			if (isExternalSurface)
+			{
+				CompositionLayerRenderThreadSyncObject SetupExternalAndroidSurfaceSyncObjects = new CompositionLayerRenderThreadSyncObject(
+					(taskQueue) =>
+					{
+						lock (taskQueue)
+						{
+							CompositionLayerRenderThreadTask task = (CompositionLayerRenderThreadTask)taskQueue.Dequeue();
+
+							//Enumerate Swapchain formats
+							compositionLayerFeature = OpenXRSettings.Instance.GetFeature<ViveCompositionLayer>();
+
+							uint imageCount;
+
+							GraphicsAPI graphicsAPI = GraphicsAPI.GLES3;
+
+							switch (SystemInfo.graphicsDeviceType)
+							{
+								case UnityEngine.Rendering.GraphicsDeviceType.OpenGLES3:
+									graphicsAPI = GraphicsAPI.GLES3;
+									break;
+								case UnityEngine.Rendering.GraphicsDeviceType.Vulkan:
+									graphicsAPI = GraphicsAPI.Vulkan;
+									break;
+								default:
+									ERROR("Unsupported Graphics API, aborting init process.");
+									return;
+							}
+
+							layerID = compositionLayerFeature.CompositionLayer_Init(externalSurfaceWidth, externalSurfaceHeight, graphicsAPI, isDynamicLayer, isProtectedSurface, out imageCount, true);
+
+							if (layerID != 0)
+							{
+								DEBUG("Init completed, ID: " + layerID);
+								layerTextures = new LayerTextures(imageCount);
+								InitStatus = true;
+							}
+
+							taskQueue.Release(task);
+						}
+					});
+
+				CompositionLayerRenderThreadTask.IssueObtainSwapchainEvent(SetupExternalAndroidSurfaceSyncObjects);
+
+				texture = new Texture2D((int)externalSurfaceWidth, (int)externalSurfaceHeight, TextureFormat.RGBA32, false, isLinear);
+
+
+				DEBUG("CompositionLayerInit Ext Surf");
+
+				return true;
+			}
+
 			if (texture == null)
 			{
 				ERROR("CompositionLayerInit: Source Texture not found, abort init.");
@@ -262,6 +325,22 @@ private bool SetLayerTexture()
 		{
 			if (!isInitializationComplete || !isSynchronized) return false;
 
+			if (isExternalSurface)
+			{
+				//Set Texture Layout
+				offset.x = 0;
+				offset.y = (int)externalSurfaceHeight;
+				extent.width = (int)externalSurfaceWidth;
+				extent.height = (int)-externalSurfaceHeight;
+				rect.offset = offset;
+				rect.extent = extent;
+
+				layerTextures.textureLayout = rect;
+
+				return true; //No need to process texture queues
+			}
+			
+
 			if (texture != null) //check for texture size change
 			{
 				if (TextureParamsChanged())
@@ -805,6 +884,14 @@ private void ActivatePlaceholder()
 			}
 		}
 
+		public IntPtr GetExternalSurfaceObj()
+		{
+			IntPtr value = compositionLayerFeature.Compositionlayer_GetExternalSurfaceObj2(layerID);
+			//DEBUG("GetExternalSurfaceObj layerID " + layerID + " SurfaceObj " + value);
+				
+			return value;
+		}
+
 		public bool RenderAsLayer()
 		{
 			if (placeholderGenerated && compositionLayerPlaceholderPrefabGO != null)