Page MenuHomeWildfire Games

Removes GL matrix stack usages from scene rendering
ClosedPublic

Authored by vladislavbelov on Apr 26 2021, 11:20 PM.

Details

Reviewers
None
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP25328: Removes GL matrix stack usages from scene rendering.
Summary

Subj, reduces old pipeline dependencies.

Test Plan
  1. Apply the patch and compile the game
  2. Make sure that everything looks the same for GLSL on/off

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

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libnetwork_dbg.a(precompiled.o) has no symbols
/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/renderer/Renderer.cpp:1465:53: error: reference to type 'const CColor' could not bind to an rvalue of type 'int'
        GetDebugRenderer().DrawCameraFrustum(m_CullCamera, 2);
                                                           ^
../../../source/renderer/DebugRenderer.h:55:62: note: passing argument to parameter 'color' here
        void DrawCameraFrustum(const CCamera& camera, const CColor& color, int intermediates = 0) const;
                                                                    ^
../../../source/renderer/Renderer.cpp:1470:53: error: reference to type 'const CColor' could not bind to an rvalue of type 'int'
        GetDebugRenderer().DrawCameraFrustum(m_CullCamera, 2);
                                                           ^
../../../source/renderer/DebugRenderer.h:55:62: note: passing argument to parameter 'color' here
        void DrawCameraFrustum(const CCamera& camera, const CColor& color, int intermediates = 0) const;
                                                                    ^
2 errors generated.
make[1]: *** [obj/graphics_Debug/Renderer.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [graphics] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4059/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    13>e:\jenkins\workspace\vs2015-differential\source\renderer\renderer.cpp(1465): error C2664: 'void CDebugRenderer::DrawCameraFrustum(const CCamera &,const CColor &,int) const': cannot convert argument 2 from 'int' to 'const CColor &' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\renderer\renderer.cpp(1470): error C2664: 'void CDebugRenderer::DrawCameraFrustum(const CCamera &,const CColor &,int) const': cannot convert argument 2 from 'int' to 'const CColor &' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5152/display/redirect

vladislavbelov requested review of this revision.Apr 26 2021, 11:32 PM
Stan added a subscriber: Stan.Apr 27 2021, 4:42 PM

Seems to work on Intel and Nvidia

This revision was not accepted when it landed; it landed in state Needs Review.Apr 27 2021, 8:44 PM
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.