Merging using vr_steamvr_rel_to_sdk_release.

This should be everything in 1.10.32 [git-p4: depot-paths = "//vr/steamvr/sdk_release/": change = 5773387]
RiceWitch · Mar 23, 2020 · 88055da · 88055da
1 parent 26fa19e
commit 88055da
Show file tree

Hide file tree

Showing 81 changed files with 15,261 additions and 4 deletions.
diff --git a/bin/androidarm64/libopenvr_api.so b/bin/androidarm64/libopenvr_api.so
diff --git a/bin/linux32/libopenvr_api.so b/bin/linux32/libopenvr_api.so
diff --git a/bin/linux32/libopenvr_api.so.dbg b/bin/linux32/libopenvr_api.so.dbg
diff --git a/bin/linux64/libopenvr_api.so b/bin/linux64/libopenvr_api.so
diff --git a/bin/linux64/libopenvr_api.so.dbg b/bin/linux64/libopenvr_api.so.dbg
diff --git a/bin/linuxarm64/libopenvr_api.so b/bin/linuxarm64/libopenvr_api.so
diff --git a/bin/linuxarm64/libopenvr_api.so.dbg b/bin/linuxarm64/libopenvr_api.so.dbg
diff --git a/bin/linuxarm64/libopenvr_api_unity.so b/bin/linuxarm64/libopenvr_api_unity.so
diff --git a/bin/linuxarm64/libopenvr_api_unity.so.dbg b/bin/linuxarm64/libopenvr_api_unity.so.dbg
diff --git a/bin/win32/openvr_api.dll b/bin/win32/openvr_api.dll
diff --git a/bin/win32/openvr_api.dll.sig b/bin/win32/openvr_api.dll.sig
diff --git a/bin/win32/openvr_api.pdb b/bin/win32/openvr_api.pdb
diff --git a/bin/win64/openvr_api.dll b/bin/win64/openvr_api.dll
diff --git a/bin/win64/openvr_api.dll.sig b/bin/win64/openvr_api.dll.sig
diff --git a/bin/win64/openvr_api.pdb b/bin/win64/openvr_api.pdb
diff --git a/headers/openvr.h b/headers/openvr.h
@@ -16,7 +16,7 @@ namespace vr
 {
 	static const uint32_t k_nSteamVRVersionMajor = 1;
 	static const uint32_t k_nSteamVRVersionMinor = 10;
-	static const uint32_t k_nSteamVRVersionBuild = 30;
+	static const uint32_t k_nSteamVRVersionBuild = 32;
 } // namespace vr
 
 // vrtypes.h
@@ -4162,6 +4162,15 @@ enum EVRRenderModelError
 	VRRenderModelError_InvalidTexture = 400,
 };
 
+enum EVRRenderModelTextureFormat
+{
+	VRRenderModelTextureFormat_RGBA8_SRGB = 0, // RGBA with 8 bits per channel per pixel. Data size is width * height * 4ub
+	VRRenderModelTextureFormat_BC2,
+	VRRenderModelTextureFormat_BC4,
+	VRRenderModelTextureFormat_BC7,
+	VRRenderModelTextureFormat_BC7_SRGB
+};
+
 /** A single vertex in a render model */
 struct RenderModel_Vertex_t
 {
@@ -4180,7 +4189,8 @@ struct RenderModel_Vertex_t
 struct RenderModel_TextureMap_t
 {
 	uint16_t unWidth, unHeight; // width and height of the texture map in pixels
-	const uint8_t *rubTextureMapData;	// Map texture data. All textures are RGBA with 8 bits per channel per pixel. Data size is width * height * 4ub
+	const uint8_t *rubTextureMapData;	// Map texture data.
+	EVRRenderModelTextureFormat format; // Refer to EVRRenderModelTextureFormat
 };
 #if defined(__linux__) || defined(__APPLE__) 
 #pragma pack( pop )

diff --git a/headers/openvr_api.cs b/headers/openvr_api.cs
@@ -5168,6 +5168,14 @@ public enum EVRRenderModelError
 	NotEnoughTexCoords = 308,
 	InvalidTexture = 400,
 }
+public enum EVRRenderModelTextureFormat
+{
+	RGBA8_SRGB = 0,
+	BC2 = 1,
+	BC4 = 2,
+	BC7 = 3,
+	BC7_SRGB = 4,
+}
 public enum EVRNotificationType
 {
 	Transient = 0,
@@ -5947,24 +5955,28 @@ public void Unpack(ref VRControllerState_t unpacked)
 	public ushort unWidth;
 	public ushort unHeight;
 	public IntPtr rubTextureMapData; // const uint8_t *
+	public EVRRenderModelTextureFormat format;
 }
 // This structure is for backwards binary compatibility on Linux and OSX only
 [StructLayout(LayoutKind.Sequential, Pack = 4)] public struct RenderModel_TextureMap_t_Packed
 {
 	public ushort unWidth;
 	public ushort unHeight;
 	public IntPtr rubTextureMapData; // const uint8_t *
+	public EVRRenderModelTextureFormat format;
 	public RenderModel_TextureMap_t_Packed(RenderModel_TextureMap_t unpacked)
 	{
 		this.unWidth = unpacked.unWidth;
 		this.unHeight = unpacked.unHeight;
 		this.rubTextureMapData = unpacked.rubTextureMapData;
+		this.format = unpacked.format;
 	}
 	public void Unpack(ref RenderModel_TextureMap_t unpacked)
 	{
 		unpacked.unWidth = this.unWidth;
 		unpacked.unHeight = this.unHeight;
 		unpacked.rubTextureMapData = this.rubTextureMapData;
+		unpacked.format = this.format;
 	}
 }
 [StructLayout(LayoutKind.Sequential)] public struct RenderModel_t

diff --git a/headers/openvr_api.json b/headers/openvr_api.json
@@ -1108,6 +1108,13 @@
 	,{"name": "VRRenderModelError_NotEnoughTexCoords","value": "308"}
 	,{"name": "VRRenderModelError_InvalidTexture","value": "400"}
 ]}
+,	{"enumname": "vr::EVRRenderModelTextureFormat","values": [ 
+	{"name": "VRRenderModelTextureFormat_RGBA8_SRGB","value": "0"}
+	,{"name": "VRRenderModelTextureFormat_BC2","value": "1"}
+	,{"name": "VRRenderModelTextureFormat_BC4","value": "2"}
+	,{"name": "VRRenderModelTextureFormat_BC7","value": "3"}
+	,{"name": "VRRenderModelTextureFormat_BC7_SRGB","value": "4"}
+]}
 ,	{"enumname": "vr::EVRNotificationType","values": [ 
 	{"name": "EVRNotificationType_Transient","value": "0"}
 	,{"name": "EVRNotificationType_Persistent","value": "1"}
@@ -2117,7 +2124,8 @@
 ,{"struct": "vr::RenderModel_TextureMap_t","fields": [
 { "fieldname": "unWidth", "fieldtype": "uint16_t"},
 { "fieldname": "unHeight", "fieldtype": "uint16_t"},
-{ "fieldname": "rubTextureMapData", "fieldtype": "const uint8_t *"}]}
+{ "fieldname": "rubTextureMapData", "fieldtype": "const uint8_t *"},
+{ "fieldname": "format", "fieldtype": "enum vr::EVRRenderModelTextureFormat"}]}
 ,{"struct": "vr::RenderModel_t","fields": [
 { "fieldname": "rVertexData", "fieldtype": "const struct vr::RenderModel_Vertex_t *"},
 { "fieldname": "unVertexCount", "fieldtype": "uint32_t"},

diff --git a/headers/openvr_capi.h b/headers/openvr_capi.h
@@ -1540,6 +1540,15 @@ typedef enum EVRRenderModelError
 	EVRRenderModelError_VRRenderModelError_InvalidTexture = 400,
 } EVRRenderModelError;
 
+typedef enum EVRRenderModelTextureFormat
+{
+	EVRRenderModelTextureFormat_VRRenderModelTextureFormat_RGBA8_SRGB = 0,
+	EVRRenderModelTextureFormat_VRRenderModelTextureFormat_BC2 = 1,
+	EVRRenderModelTextureFormat_VRRenderModelTextureFormat_BC4 = 2,
+	EVRRenderModelTextureFormat_VRRenderModelTextureFormat_BC7 = 3,
+	EVRRenderModelTextureFormat_VRRenderModelTextureFormat_BC7_SRGB = 4,
+} EVRRenderModelTextureFormat;
+
 typedef enum EVRNotificationType
 {
 	EVRNotificationType_Transient = 0,
@@ -2233,6 +2242,7 @@ typedef struct RenderModel_TextureMap_t
 	uint16_t unWidth;
 	uint16_t unHeight;
 	uint8_t * rubTextureMapData; // const uint8_t *
+	enum EVRRenderModelTextureFormat format;
 } RenderModel_TextureMap_t;
 
 #if defined(__linux__) || defined(__APPLE__)

diff --git a/headers/openvr_driver.h b/headers/openvr_driver.h
@@ -16,7 +16,7 @@ namespace vr
 {
 	static const uint32_t k_nSteamVRVersionMajor = 1;
 	static const uint32_t k_nSteamVRVersionMinor = 10;
-	static const uint32_t k_nSteamVRVersionBuild = 30;
+	static const uint32_t k_nSteamVRVersionBuild = 32;
 } // namespace vr
 
 // vrtypes.h

diff --git a/lib/androidarm64/libopenvr_api.so b/lib/androidarm64/libopenvr_api.so
diff --git a/lib/linux32/libopenvr_api.so b/lib/linux32/libopenvr_api.so
diff --git a/lib/linux64/libopenvr_api.so b/lib/linux64/libopenvr_api.so
diff --git a/lib/linuxarm64/libopenvr_api.so b/lib/linuxarm64/libopenvr_api.so
diff --git a/lib/linuxarm64/libopenvr_api_unity.so b/lib/linuxarm64/libopenvr_api_unity.so
diff --git a/samples/bin/androidarm64/libopenvr_api.so b/samples/bin/androidarm64/libopenvr_api.so
diff --git a/samples/bin/hmd_opencv_sandbox_resources/charlesfloor.frag b/samples/bin/hmd_opencv_sandbox_resources/charlesfloor.frag
@@ -0,0 +1,15 @@
+#version 430 core
+uniform sampler2D mytexture;
+in vec2 v2UVcoords;
+in vec3 opos;
+out vec4 outputColor;
+layout(location = 7) uniform vec4 coloruniform;
+void main()
+{
+   vec2 grid = clamp(  sin( v2UVcoords*6000.0 )*60.0 - 58.0, vec2(0.0), vec2(1.0) ); //Make grid doodad
+	//vec2 dgrid = sqrt( abs( dFdy( v2UVcoords ) +  dFdx( v2UVcoords ) ) ); //Fade out colors to avoid aliasing by using derivitive.
+   float dgrid = 4.0 - length( opos.xz )*.5;
+   outputColor = vec4( ( vec3( length(grid) ) *0.1 + 0.05 ) * clamp (dgrid,0.0,1.0), 1.0 ) * coloruniform;
+
+
+}
diff --git a/samples/bin/hmd_opencv_sandbox_resources/charlesfloor.vert b/samples/bin/hmd_opencv_sandbox_resources/charlesfloor.vert
@@ -0,0 +1,15 @@
+#version 430
+
+layout(location = 0) uniform mat4 matrix;
+layout(location = 0) in vec3 position;
+layout(location = 1) in vec2 v2UVcoordsIn;
+
+out vec2 v2UVcoords;
+out vec3 opos;
+void main()
+{
+	v2UVcoords = v2UVcoordsIn*2.0-1.0;
+	opos = position;
+	//gl_Position = matrix * vec4( position, 1.0 ) * ( vec4( 1., 1., 0., 1. ) /* Tricky: Don't far clip. */ );
+	gl_Position = matrix * vec4( position, 1.0 );
+}
diff --git a/samples/bin/hmd_opencv_sandbox_resources/codepage437.pgm b/samples/bin/hmd_opencv_sandbox_resources/codepage437.pgm
diff --git a/samples/bin/hmd_opencv_sandbox_resources/codepage437.png b/samples/bin/hmd_opencv_sandbox_resources/codepage437.png
diff --git a/samples/bin/hmd_opencv_sandbox_resources/companion.frag b/samples/bin/hmd_opencv_sandbox_resources/companion.frag
@@ -0,0 +1,9 @@
+#version 410 core
+
+uniform sampler2D mytexture;
+noperspective in vec2 v2UV;
+out vec4 outputColor;
+void main()
+{
+		outputColor = texture(mytexture, v2UV);
+}
diff --git a/samples/bin/hmd_opencv_sandbox_resources/companion.vert b/samples/bin/hmd_opencv_sandbox_resources/companion.vert
@@ -0,0 +1,11 @@
+#version 410 core
+
+layout(location = 0) in vec4 position;
+layout(location = 1) in vec2 v2UVIn;
+noperspective out vec2 v2UV;
+
+void main()
+{
+	v2UV = v2UVIn;
+	gl_Position = position;
+}
diff --git a/samples/bin/hmd_opencv_sandbox_resources/dumb.frag b/samples/bin/hmd_opencv_sandbox_resources/dumb.frag
@@ -0,0 +1,9 @@
+#version 430 core
+
+layout(location = 8) uniform sampler2D mytexture;
+in vec4 colorTrans;
+out vec4 outputColor;
+void main()
+{
+   outputColor = vec4( colorTrans.rgba  );
+}
diff --git a/samples/bin/hmd_opencv_sandbox_resources/dumb.vert b/samples/bin/hmd_opencv_sandbox_resources/dumb.vert
@@ -0,0 +1,12 @@
+#version 430
+layout(location = 0) uniform mat4 matrix;
+layout(location = 7) uniform vec4 coloruniform;
+layout(location = 0) in vec3 position;
+layout(location = 1) in vec4 color;
+out vec4 colorTrans;
+
+void main()
+{
+	colorTrans = color * coloruniform * vec4( 1.0, 1.0, 1.0, 1. );
+	gl_Position = matrix * vec4( position, 1.0 );
+}
diff --git a/samples/bin/hmd_opencv_sandbox_resources/hmd_opencv_sandbox_actions.json b/samples/bin/hmd_opencv_sandbox_resources/hmd_opencv_sandbox_actions.json
@@ -0,0 +1,55 @@
+{
+      "default_bindings": [
+        {
+          "controller_type": "generic",
+          "binding_url": "hmd_opencv_sandbox_bindings_generic.json"
+        }
+      ], 
+  "actions": [
+    {
+      "name": "/actions/demo/in/HideCubes",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/demo/in/advance_demo",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/demo/in/triggerhaptic",
+      "type": "boolean"
+    },
+    {
+      "name": "/actions/demo/in/AnalogInput",
+      "type": "vector2"
+    },
+    {
+      "name": "/actions/demo/in/Hand_Right",
+      "type": "pose"
+    },
+    {
+      "name": "/actions/demo/in/Hand_Left",
+      "type": "pose"
+    },
+    {
+      "name": "/actions/demo/out/haptic_left",
+      "type": "vibration"
+    },
+    {
+      "name": "/actions/demo/out/haptic_right",
+      "type": "vibration"
+    }
+  ],
+    "localization" : [
+      {
+        "language_tag": "en_US",
+        "/actions/demo/in/HideCubes": "Hide Cubes",
+        "/actions/demo/in/advance_demo": "Advance Demo",
+        "/actions/demo/in/triggerhaptic": "Trigger Haptic Pulse",
+        "/actions/demo/in/AnalogInput": "Analog Input",
+        "/actions/demo/in/Hand_Right": "Right Hand Pose",
+        "/actions/demo/in/Hand_Left": "Left Hand Pose",
+        "/actions/demo/out/haptic_left": "Left Haptic Feedback",
+        "/actions/demo/out/haptic_right": "Right Haptic Feedback"
+      }
+    ]
+}
diff --git a/samples/bin/hmd_opencv_sandbox_resources/hmd_opencv_sandbox_bindings_generic.json b/samples/bin/hmd_opencv_sandbox_resources/hmd_opencv_sandbox_bindings_generic.json
@@ -0,0 +1,94 @@
+{
+   "bindings" : {
+      "/actions/demo" : {
+         "poses" : [
+            {
+               "output" : "/actions/demo/in/hand_left",
+               "path" : "/user/hand/left/pose/raw"
+            },
+            {
+               "output" : "/actions/demo/in/hand_right",
+               "path" : "/user/hand/right/pose/raw"
+            }
+         ],
+         "haptics" : [
+            {
+               "output" : "/actions/demo/out/haptic_right",
+               "path" : "/user/hand/right/output/haptic"
+            },
+            {
+               "output" : "/actions/demo/out/haptic_left",
+               "path" : "/user/hand/left/output/haptic"
+            }
+         ],
+         "sources" : [
+            {
+               "inputs" : {
+                  "click" : {
+                     "output" : "/actions/demo/in/hidecubes"
+                  }
+               },
+               "mode" : "button",
+               "path" : "/user/hand/right/input/trigger"
+            },
+            {
+               "inputs" : {
+                  "position" : {
+                     "output" : "/actions/demo/in/analoginput"
+                  }
+               },
+               "mode" : "trackpad",
+               "path" : "/user/hand/right/input/trackpad"
+            },
+            {
+               "inputs" : {
+                  "click" : {
+                     "output" : "/actions/demo/in/triggerhaptic"
+                  }
+               },
+               "mode" : "button",
+               "path" : "/user/hand/right/input/grip"
+            },
+            {
+               "inputs" : {
+                  "click" : {
+                     "output" : "/actions/demo/in/hidecubes"
+                  }
+               },
+               "mode" : "button",
+               "path" : "/user/hand/left/input/trigger"
+            },
+            {
+               "inputs" : {
+                  "click" : {
+                     "output" : "/actions/demo/in/triggerhaptic"
+                  }
+               },
+               "mode" : "button",
+               "path" : "/user/hand/left/input/grip"
+            },
+            {
+               "inputs" : {
+                  "click" : {
+                     "output" : "/actions/demo/in/advance_demo"
+                  }
+               },
+               "mode" : "button",
+               "path" : "/user/hand/left/input/b"
+            },
+            {
+               "inputs" : {
+                  "click" : {
+                     "output" : "/actions/demo/in/advance_demo"
+                  }
+               },
+               "mode" : "button",
+               "path" : "/user/hand/right/input/b"
+            }
+         ]
+      }
+   },
+   "controller_type" : "generic",
+   "description" : "Bindings for the OpenVR SDK \"hellovr_opengl\" demo for a generic controller",
+   "name" : "HelloVR bindings for a generic controller"
+}