ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't upload / bind skinning ubo if not supported

Browse Source
This commit is contained in:
Benau 2016-12-15 12:17:39 +08:00
parent 1f23e6e783
commit 2e2345289c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/shader_based_renderer.cpp
View File

@ -268,10 +268,11 @@ void ShaderBasedRenderer::renderScene(scene::ICameraSceneNode * const camnode,
bool hasShadow, bool hasShadow,
bool forceRTT) bool forceRTT)
{ {
if(CVS->isARBUniformBufferObjectUsable()) if (CVS->isARBUniformBufferObjectUsable())
{ {
glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedGPUObjects::getViewProjectionMatricesUBO()); glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedGPUObjects::getViewProjectionMatricesUBO());
glBindBufferBase(GL_UNIFORM_BUFFER, 1, SharedGPUObjects::getLightingDataUBO()); glBindBufferBase(GL_UNIFORM_BUFFER, 1, SharedGPUObjects::getLightingDataUBO());
if (CVS->supportsHardwareSkinning())
glBindBufferBase(GL_UNIFORM_BUFFER, 2, SharedGPUObjects::getSkinningUBO()); glBindBufferBase(GL_UNIFORM_BUFFER, 2, SharedGPUObjects::getSkinningUBO());
} }
irr_driver->getSceneManager()->setActiveCamera(camnode); irr_driver->getSceneManager()->setActiveCamera(camnode);

3
src/graphics/shared_gpu_objects.cpp
View File

@ -223,10 +223,11 @@ void SharedGPUObjects::init()
initFrustrumVBO(); initFrustrumVBO();
initParticleQuadVBO(); initParticleQuadVBO();
if(CVS->isARBUniformBufferObjectUsable()) if (CVS->isARBUniformBufferObjectUsable())
{ {
initShadowVPMUBO(); initShadowVPMUBO();
initLightingDataUBO(); initLightingDataUBO();
if (CVS->supportsHardwareSkinning())
initSkinningUBO(); initSkinningUBO();
} }

2
src/graphics/vao_manager.hpp
View File

@ -26,8 +26,6 @@
#include <map> #include <map>
#include <unordered_map> #include <unordered_map>
class RenderInfo;
enum InstanceType enum InstanceType
{ {
InstanceTypeThreeTex, InstanceTypeThreeTex,