OpenXR 1.0.5 release (6-December-2019)

Patch release for the 1.0 series. This release primarily contains extension reservations and small specification clarifications/fixes. ### GitHub Pull Requests These had been integrated into the public repo incrementally. - Loader tests - #147 - Small bugfix and output extension ### Internal issues - Registry - Reserve Microsoft extension numbers (Internal MR 1613)
KhronosGroup · Dec 7, 2019 · 964b73c · 964b73c
1 parent 7462cda
commit 964b73c
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 3 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.90.1.{build}
+version: 1.0.5.{build}
 image: Visual Studio 2017
 
 

diff --git a/CHANGELOG.SDK.md b/CHANGELOG.SDK.md
@@ -13,6 +13,25 @@ along with any public pull requests that have been accepted.
 In this repository in particular, since it is primarily software,
 pull requests may be integrated as they are accepted even between periodic updates.
 
+## OpenXR 1.0.5 release (6-December-2019)
+
+Patch release for the 1.0 series.
+
+This release primarily contains extension reservations and small specification
+clarifications/fixes.
+
+### GitHub Pull Requests
+
+These had been integrated into the public repo incrementally.
+
+- Loader tests
+  - #147 - Small bugfix and output extension
+
+### Internal issues
+
+- Registry
+  - Reserve Microsoft extension numbers (Internal MR 1613)
+
 ## OpenXR 1.0.4 release (21-November-2019)
 
 Patch release for the 1.0 series.

diff --git a/include/openxr/openxr.h b/include/openxr/openxr.h
@@ -35,7 +35,7 @@ extern "C" {
     ((((major) & 0xffffULL) << 48) | (((minor) & 0xffffULL) << 32) | ((patch) & 0xffffffffULL))
 
 // OpenXR current version number.
-#define XR_CURRENT_API_VERSION XR_MAKE_VERSION(1, 0, 4)
+#define XR_CURRENT_API_VERSION XR_MAKE_VERSION(1, 0, 5)
 
 #define XR_VERSION_MAJOR(version) (uint16_t)(((uint64_t)(version) >> 48)& 0xffffULL)
 #define XR_VERSION_MINOR(version) (uint16_t)(((uint64_t)(version) >> 32) & 0xffffULL)

diff --git a/specification/registry/xr.xml b/specification/registry/xr.xml
@@ -113,7 +113,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project.
         updates them automatically by processing a line at a time.
         -->
         <type category="define">// OpenXR current version number.
-#define <name>XR_CURRENT_API_VERSION</name> <type>XR_MAKE_VERSION</type>(1, 0, 4)</type>
+#define <name>XR_CURRENT_API_VERSION</name> <type>XR_MAKE_VERSION</type>(1, 0, 5)</type>
 
         <!-- 
         NOTE: For avoidance of ambiguity, there should only be 1 <name> tag immediately in
@@ -2448,5 +2448,54 @@ maintained in the master branch of the Khronos OpenXR GitHub project.
         </require>
     </extension>
 
+    <extension name="XR_MSFT_extension_50" number="50" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_MSFT_extension_50_SPEC_VERSION"/>
+            <enum value="&quot;XR_MSFT_extension_50&quot;" name="XR_MSFT_extension_50_EXTENSION_NAME"/>
+        </require>
+    </extension>
+    <extension name="XR_MSFT_extension_51" number="51" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_MSFT_extension_51_SPEC_VERSION"/>
+            <enum value="&quot;XR_MSFT_extension_51&quot;" name="XR_MSFT_extension_51_EXTENSION_NAME"/>
+        </require>
+    </extension>
+    <extension name="XR_MSFT_extension_52" number="52" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_MSFT_extension_52_SPEC_VERSION"/>
+            <enum value="&quot;XR_MSFT_extension_52&quot;" name="XR_MSFT_extension_52_EXTENSION_NAME"/>
+        </require>
+    </extension>
+    <extension name="XR_MSFT_extension_53" number="53" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_MSFT_extension_53_SPEC_VERSION"/>
+            <enum value="&quot;XR_MSFT_extension_53&quot;" name="XR_MSFT_extension_53_EXTENSION_NAME"/>
+        </require>
+    </extension>
+    <extension name="XR_MSFT_extension_54" number="54" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_MSFT_extension_54_SPEC_VERSION"/>
+            <enum value="&quot;XR_MSFT_extension_54&quot;" name="XR_MSFT_extension_54_EXTENSION_NAME"/>
+        </require>
+    </extension>
+    <extension name="XR_MSFT_extension_55" number="55" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_MSFT_extension_55_SPEC_VERSION"/>
+            <enum value="&quot;XR_MSFT_extension_55&quot;" name="XR_MSFT_extension_55_EXTENSION_NAME"/>
+        </require>
+    </extension>
+    <extension name="XR_MSFT_extension_56" number="56" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_MSFT_extension_56_SPEC_VERSION"/>
+            <enum value="&quot;XR_MSFT_extension_56&quot;" name="XR_MSFT_extension_56_EXTENSION_NAME"/>
+        </require>
+    </extension>
+    <extension name="XR_MSFT_extension_57" number="57" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_MSFT_extension_57_SPEC_VERSION"/>
+            <enum value="&quot;XR_MSFT_extension_57&quot;" name="XR_MSFT_extension_57_EXTENSION_NAME"/>
+        </require>
+    </extension>
+
     </extensions>
 </registry>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -92,6 +92,48 @@ if (BUILD_ALL_EXTENSIONS AND NOT VulkanHeaders_FOUND)
     message(FATAL_ERROR "Vulkan headers not found")
 endif()
 
+# Find glslc shader compiler.
+# On Android, the NDK includes the binary, so no external dependency.
+if(ANDROID)
+    file(GLOB glslc-folders ${ANDROID_NDK}/shader-tools/*)
+else()
+    file(GLOB glslc-folders $ENV{VULKAN_SDK}/*)
+endif()
+find_program(CMAKE_GLSL_COMPILER glslc PATHS ${glslc-folders} NO_DEFAULT_PATH)
+if(CMAKE_GLSL_COMPILER)
+    message(STATUS "Found glslc: ${CMAKE_GLSL_COMPILER}")
+else()
+    message(STATUS "Could NOT find glslc, using precompiled .spv files")
+endif()
+
+function(compile_glsl run_target_name)
+    set(glsl_output_files "")
+    foreach(in_file IN LISTS ARGN)
+        get_filename_component(glsl_stage ${in_file} NAME_WE)
+        set(out_file ${CMAKE_CURRENT_BINARY_DIR}/${glsl_stage}.spv)
+        if(CMAKE_GLSL_COMPILER)
+            # Run glslc if we can find it
+            add_custom_command(
+                OUTPUT ${out_file}
+                COMMAND ${CMAKE_GLSL_COMPILER} -mfmt=c -fshader-stage=${glsl_stage} ${in_file} -o ${out_file}
+                DEPENDS ${in_file}
+            )
+        else()
+            # Use the precompiled .spv files
+            get_filename_component(glsl_src_dir ${in_file} DIRECTORY)
+            set(precompiled_file ${glsl_src_dir}/${glsl_stage}.spv)
+            configure_file(${precompiled_file} ${out_file} COPYONLY)
+        endif()
+        list(APPEND glsl_output_files ${out_file})
+    endforeach()
+    add_custom_target(
+        ${run_target_name} ALL
+        DEPENDS ${glsl_output_files}
+    )
+	set_target_properties(${run_target_name} PROPERTIES FOLDER ${HELPER_FOLDER})
+
+endfunction()
+
 find_package(OpenGL)
 if (OPENGL_FOUND)
     add_definitions(-DXR_USE_GRAPHICS_API_OPENGL)