Differential D3429

Adds Vulkan check to HWDetect
ClosedPublic
Actions

Authored by vladislavbelov on Jan 19 2021, 11:32 PM.

Details

Reviewers

None

Group Reviewers

Restricted Owners Package

(Owns No Changed Paths)

Commits

rP25535: Adds Vulkan check to HWDetect reports.

Summary

Subj. Make sure that it works when Vulkan disabled and enabled for SDL.

Test Plan

Apply the patch and compile the game with different SDL settings
Make sure no crash in any case and the function doesn't cost noticeable time

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vladislavbelov created this revision.Jan 19 2021, 11:32 PM

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblobby_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
../../../source/graphics/ShaderProgram.cpp:86:15: warning: 'Reload' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Reload()
                     ^
../../../source/graphics/ShaderProgram.h:124:15: note: overridden virtual function is here
        virtual void Reload() = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:118:15: warning: 'Bind' overrides a member function

See https://jenkins.wildfiregames.com/job/macos-differential/2983/display/redirect for more details.

userreport_hwdetect.txt16 KBDownload

Says can't load for me.

source/ps/GameSetup/HWDetect.cpp
221 ↗	(On Diff #15547)	Was already incremented by @Imarok I believe.

Harbormaster completed remote builds in B15268: Diff 15547.Jan 20 2021, 12:09 AM

vladislavbelov requested review of this revision.Jan 20 2021, 12:09 AM

In D3429#151826, @Stan wrote:

userreport_hwdetect.txt16 KBDownload
Says can't load for me.

Then it means that SDL can't find vulkan for you or SDL compiled without Vulkan support.

Maybe it makes sense to write platform specific code instead.

Does it work for you?

Good news! I've figured out the problem. Or SDl dll doesn't work but updating it to 2.0.14 makes it work again. You can merge this either before or after I update the sdl. Might do so soon.

Imarok added inline comments.Apr 29 2021, 10:22 AM