Aging SceneGraph::Renderer::mRegenerateUniformMap() isn't necessarily matched by
calls to Render::Renderer::SetUniforms(), which isn't called if textures aren't ready.
Change-Id: Ifb1d366c579dac196de27d653688e776184a513d
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
const SceneGraph::UniformMapDataProvider& uniformMapDataProvider = mRenderDataProvider->GetUniformMap();
if( uniformMapDataProvider.GetUniformMapChanged( bufferIndex ) ||
const SceneGraph::UniformMapDataProvider& uniformMapDataProvider = mRenderDataProvider->GetUniformMap();
if( uniformMapDataProvider.GetUniformMapChanged( bufferIndex ) ||
- node.GetUniformMapChanged(bufferIndex))
+ node.GetUniformMapChanged(bufferIndex) ||
+ mUniformIndexMap.Count() == 0)
{
const SceneGraph::CollectedUniformMap& uniformMap = uniformMapDataProvider.GetUniformMap( bufferIndex );
const SceneGraph::CollectedUniformMap& uniformMapNode = node.GetUniformMap( bufferIndex );
{
const SceneGraph::CollectedUniformMap& uniformMap = uniformMapDataProvider.GetUniformMap( bufferIndex );
const SceneGraph::CollectedUniformMap& uniformMapNode = node.GetUniformMap( bufferIndex );
void Renderer::TextureSetChanged()
{
void Renderer::TextureSetChanged()
{
+ mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
mResendFlag |= RESEND_DATA_PROVIDER;
}
mResendFlag |= RESEND_DATA_PROVIDER;
}
+ mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
mResendFlag |= RESEND_DATA_PROVIDER;
}
void Renderer::ConnectionsChanged( PropertyOwner& object )
mResendFlag |= RESEND_DATA_PROVIDER;
}
void Renderer::ConnectionsChanged( PropertyOwner& object )