Skip to content

Update DXUT port and add Effects11 (FX) port#16101

Merged
ras0219-msft merged 20 commits intomicrosoft:masterfrom
walbourn:dxutfx11
Feb 11, 2021
Merged

Update DXUT port and add Effects11 (FX) port#16101
ras0219-msft merged 20 commits intomicrosoft:masterfrom
walbourn:dxutfx11

Conversation

@walbourn
Copy link
Member

@walbourn walbourn commented Feb 8, 2021

This updates the existing DXUT port to the latest version (it was last updated to the September 2016 release). The upstream project was updated with it's own CMake project and package support to simplify this port.

Also added a new Effects11 port for the Effects system for Direct3D 11. Again, the upstream project now provides a CMake.

@walbourn
Copy link
Member Author

walbourn commented Feb 8, 2021

Validated with all supported triplets:

vcpkg install dxut:x86-windows
vcpkg install dxut:x86-windows-static
vcpkg install dxut:x64-windows
vcpkg install dxut:x64-windows-static
vcpkg install dxut:arm-windows
vcpkg install dxut:arm64-windows
vcpkg install dxut:arm64-windows-static

vcpkg install effects11:x86-windows
vcpkg install effects11:x86-windows-static
vcpkg install effects11:x64-windows
vcpkg install effects11:x64-windows-static
vcpkg install effects11:arm-windows
vcpkg install effects11:arm64-windows
vcpkg install effects11:arm64-windows-static
vcpkg install effects11:x86-uwp
vcpkg install effects11:x64-uwp
vcpkg install effects11:arm-uwp
vcpkg install effects11:arm64-uwp

Note that vcpkg does not have a arm-windows-static triplet defined.

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

Awesome, thanks for the PR!

LGTM once my two suggestions are applied.

@walbourn walbourn requested a review from ras0219-msft February 8, 2021 22:08
@NancyLi1013 NancyLi1013 added category:port-update The issue is with a library, which is requesting update new revision category:new-port The issue is requesting a new library to be added; consider making a PR! labels Feb 9, 2021
@NancyLi1013
Copy link
Contributor

Seems the format for vcpkg.json is not correct.

Could you please use vcpkg format-manifest ./ports/xxx/vcpkg.json to format it?

@walbourn
Copy link
Member Author

walbourn commented Feb 9, 2021

@NancyLi1013 It didn't like having a port-version of 0 in the vcpkg.json... Fixed.

walbourn and others added 19 commits February 9, 2021 01:49
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@walbourn
Copy link
Member Author

walbourn commented Feb 9, 2021

@NancyLi1013 So I've fixed all the issues with dxut and effects11, sync'd master, and rebased.

The remaining failure isn't my port:

Error: While reading versions for port log4cpp from file: C:\a\1\s\versions\l-\log4cpp.json
        Version `2.9.1#4` was not found in versions file.
        Run:

           vcpkg x-add-version log4cpp

        to add the new port version.

@walbourn
Copy link
Member Author

walbourn commented Feb 9, 2021

Merged #16138 so that should fix that failure...

@walbourn
Copy link
Member Author

@ras0219-msft @NancyLi1013 I believe at this point all your feedback has been integrated. Please approve.

@ras0219-msft ras0219-msft merged commit de686c4 into microsoft:master Feb 11, 2021
@ras0219-msft
Copy link
Contributor

Yep, this is great! Thanks for the new versions and the update PR!

@walbourn walbourn deleted the dxutfx11 branch February 11, 2021 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:new-port The issue is requesting a new library to be added; consider making a PR! category:port-update The issue is with a library, which is requesting update new revision

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants