Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up WIN32/WindowsStore in CMake projects. #199

Merged

Conversation

brycehutchings
Copy link
Contributor

This simplifies things in most places by removing WindowsStore-specific
code or fixing areas that assume "Windows" system when they should
assume WIN32 (which includes WindowsStore). As a consequence, more
projects can be built for UWP. Finally, this fixes build issues when
building ARM/ARM64 for Win32 related to bad OpenGL and Vulkan
detection in CMake.

This simplifies things in most places by removing WindowsStore-specific
code or fixing areas that assume "Windows" system when they should
assume WIN32 (which includes WindowsStore). As a consequence, more
projects can be built for UWP. Finally, this fixes build issues when
building ARM/ARM64 for Win32 related to bad OpenGL and Vulkan
detection in CMake.
@brycehutchings brycehutchings requested a review from rpavlik August 4, 2020 17:51
Copy link
Contributor

@rpavlik rpavlik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks pretty good, just have one question where a change I made got reverted. I had namespaced the name of the runtime list app so it could be installed system wide on Linux. If that breaks some other platform I can carry the patch in the Debian packaging, but I'd also like to know what gets broken 😁

src/tests/list/CMakeLists.txt Show resolved Hide resolved
@rpavlik
Copy link
Contributor

rpavlik commented Aug 6, 2020

awesome, thanks!

@rpavlik rpavlik merged commit 73c4051 into KhronosGroup:master Aug 6, 2020
rpavlik added a commit that referenced this pull request Aug 14, 2020
This release is mainly for SDK improvements, with only small changes to
the docs. A new error code is provided for xrCreateSession for
developers convenience.

-   Registry
    -   Register ULTRALEAP author ID for Ultraleap. (internal MR 1877)
    -   Reserve the extension number 98 to 101 for future MSFT
        extensions. (internal MR 1879)
    -   schema: Distinguish parentstruct and structextends attributes in
        comments. (internal MR 1881, OpenXR-Docs/#51, internal issue
        1396)
    -   Add a new result code,
        XR_ERROR_GRAPHICS_REQUIREMENTS_CALL_MISSING, for runtimes to
        return if xrBeginSession is called before calling one of the
        xrGetGraphicsRequirements calls. (internal MR 1882,
        OpenXR-Docs/#53, internal issue 1397)
-   SDK
    -   Improve language usage in code and comments to be more
        respectful. (internal MR 1881)
    -   Loader: Correct type of “extension_version” in API layer
        manifest files to string, while maintaining backwards
        compatibility. Remove undocumented and unused
        “device_extensions” and “entrypoints” keys. (internal MR 1867,
        internal issue 1411)
    -   Replace usage of std::filesystem::canonical with
        PathCchCanonicalize on Windows platform to work around bug on
        UWP platforms. This also replaces PathCanonicalize with
        PathCchCanonicalize and adds the appropriate library for linking
        in. (OpenXR-SDK-Source/#198)
    -   Support for building more projects when targeting UWP, and
        support for all architectures when targeting Win32.
        (OpenXR-SDK-Source/#199)
    -   hello_xr: fix Vulkan image layout transitions. (internal MR
        1876)
    -   validation: Enable three additional checks (on optional arrays
        with non- optional counts) that were missing because of a script
        error. (internal MR 1881)
rhabacker pushed a commit to rhabacker/OpenXR-SDK-Source that referenced this pull request Nov 16, 2022
This release is mainly for SDK improvements, with only small changes to
the docs. A new error code is provided for xrCreateSession for
developers convenience.

-   Registry
    -   Register ULTRALEAP author ID for Ultraleap. (internal MR 1877)
    -   Reserve the extension number 98 to 101 for future MSFT
        extensions. (internal MR 1879)
    -   schema: Distinguish parentstruct and structextends attributes in
        comments. (internal MR 1881, OpenXR-Docs/KhronosGroup#51, internal issue
        1396)
    -   Add a new result code,
        XR_ERROR_GRAPHICS_REQUIREMENTS_CALL_MISSING, for runtimes to
        return if xrBeginSession is called before calling one of the
        xrGetGraphicsRequirements calls. (internal MR 1882,
        OpenXR-Docs/KhronosGroup#53, internal issue 1397)
-   SDK
    -   Improve language usage in code and comments to be more
        respectful. (internal MR 1881)
    -   Loader: Correct type of “extension_version” in API layer
        manifest files to string, while maintaining backwards
        compatibility. Remove undocumented and unused
        “device_extensions” and “entrypoints” keys. (internal MR 1867,
        internal issue 1411)
    -   Replace usage of std::filesystem::canonical with
        PathCchCanonicalize on Windows platform to work around bug on
        UWP platforms. This also replaces PathCanonicalize with
        PathCchCanonicalize and adds the appropriate library for linking
        in. (OpenXR-SDK-Source/KhronosGroup#198)
    -   Support for building more projects when targeting UWP, and
        support for all architectures when targeting Win32.
        (OpenXR-SDK-Source/KhronosGroup#199)
    -   hello_xr: fix Vulkan image layout transitions. (internal MR
        1876)
    -   validation: Enable three additional checks (on optional arrays
        with non- optional counts) that were missing because of a script
        error. (internal MR 1881)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants