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.

Sign up for GitHub

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

Jump to bottom

set the correct program link parameters #3110

Merged
merged 24 commits into from
Sep 29, 2021
Merged

set the correct program link parameters #3110

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
cb3694f
shadermanager.hpp setProgramTemplate
bosvensson1 Sep 14, 2021
10ee7ce
shadermanager.hpp
bosvensson1 Sep 14, 2021
62d1595
shadermanager.cpp setProgramTemplate
bosvensson1 Sep 14, 2021
6ac9d86
shadervisitor.hpp setProgramTemplate
bosvensson1 Sep 14, 2021
f2cc95e
shadervisitor.cpp setProgramTemplate
bosvensson1 Sep 14, 2021
bb7e632
scenemanager.cpp setProgramTemplate
bosvensson1 Sep 14, 2021
fb001dd
scenemanager.hpp setProgramTemplate
bosvensson1 Sep 14, 2021
88662d4
renderingmanager.cpp
bosvensson1 Sep 14, 2021
497e7c0
groundcover.cpp setProgramTemplate
bosvensson1 Sep 14, 2021
da04efc
groundcover.hpp
bosvensson1 Sep 14, 2021
f5eee59
groundcover.cpp
bosvensson1 Sep 14, 2021
0290644
shadervisitor.cpp
bosvensson1 Sep 14, 2021
707850f
util.cpp
bosvensson1 Sep 14, 2021
57c3ed7
lightmanager.cpp
bosvensson1 Sep 14, 2021
14f358c
scenemanager.cpp
bosvensson1 Sep 14, 2021
064fba0
scenemanager.hpp
bosvensson1 Sep 14, 2021
212f233
lightmanager.cpp
bosvensson1 Sep 14, 2021
94bd16e
lightmanager.cpp
bosvensson1 Sep 14, 2021
2719862
Merge branch 'OpenMW:master' into bosvensson1-patch-4
bosvensson1 Sep 15, 2021
4825930
lightmanager.cpp
bosvensson1 Sep 15, 2021
75efb86
scenemanager.hpp [ci skip]
bosvensson1 Sep 15, 2021
02a66b5
water.cpp
bosvensson1 Sep 15, 2021
724f336
groundcover.cpp
bosvensson1 Sep 15, 2021
bd2fc9a
shadermanager.hpp
bosvensson1 Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lightmanager.cpp
  • Loading branch information
@bosvensson1
bosvensson1 committed Sep 14, 2021
commit 212f2332546657a9c08edbe3fb57cbcb950a6de8
4 changes: 2 additions & 2 deletions components/sceneutil/lightmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,9 @@ namespace SceneUtil
auto bo = mLightManager->getLightBuffer(mLastFrameNumber);

#if OSG_VERSION_GREATER_OR_EQUAL(3,5,7)
osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), bo->getData(), 0, bo->getData()->getTotalDataSize());
osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), bo->getData(), 0, bo->getData()->getTotalDataSize());
#else
osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), bo->getData()->getBufferObject(), 0, bo->getData()->getTotalDataSize());
osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), bo->getData()->getBufferObject(), 0, bo->getData()->getTotalDataSize());
#endif
stateset->setAttributeAndModes(ubb, osg::StateAttribute::ON);
}
Expand Down