sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes 

Former-commit-id: 1282e3600c687647f637aec42f05d033266e1d33
This commit is contained in:
Lynix 2015-01-04 13:08:26 +01:00
parent a1624af969
commit e69c2982b9
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/HashDigest.hpp
View File

@ -11,7 +11,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
#include <ostream> #include <iosfwd>
class NAZARA_API NzHashDigest class NAZARA_API NzHashDigest
{ {

2
src/Nazara/Audio/Loaders/sndfile/Loader.cpp
View File

@ -61,7 +61,7 @@ namespace
sf_count_t Tell(void* user_data) sf_count_t Tell(void* user_data)
{ {
NzInputStream* stream = reinterpret_cast<NzInputStream*>(user_data); NzInputStream* stream = static_cast<NzInputStream*>(user_data);
return stream->GetCursorPos(); return stream->GetCursorPos();
} }

8
src/Nazara/Core/Hash/SHA/Internal.cpp
View File

@ -770,14 +770,6 @@ void SHA224_Init(SHA_CTX* context)
SHA256_Internal_Init(context, sha224_initial_hash_value); SHA256_Internal_Init(context, sha224_initial_hash_value);
} }
namespace
{
void SHA224_Internal_Transform(SHA_CTX* context, const nzUInt32* data)
{
SHA256_Internal_Transform(context, data);
}
}
void SHA224_Update(SHA_CTX* context, const nzUInt8 *data, std::size_t len) void SHA224_Update(SHA_CTX* context, const nzUInt8 *data, std::size_t len)
{ {
SHA256_Update(context, data, len); SHA256_Update(context, data, len);

16
src/Nazara/Renderer/UberShaderPreprocessor.cpp
View File

@ -81,22 +81,18 @@ NzUberShaderInstance* NzUberShaderPreprocessor::Get(const NzParameterList& param
stage.SetSource(code); stage.SetSource(code);
stage.Compile(); stage.Compile();
shader->AttachStage(static_cast<nzShaderStage>(i), stage); stageIt = shaderStage.cache.emplace(flags, std::move(stage)).first;
shaderStage.cache.emplace(flags, std::move(stage));
} }
else
shader->AttachStage(static_cast<nzShaderStage>(i), stageIt->second); shader->AttachStage(static_cast<nzShaderStage>(i), stageIt->second);
} }
} }
shader->Link(); shader->Link();
// On construit l'instant // On construit l'instant
auto pair = m_cache.emplace(flags, shader.get()); shaderIt = m_cache.emplace(flags, shader.get()).first;
shader.release(); shader.release();
return &(pair.first)->second; // On retourne l'objet construit
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -106,8 +102,8 @@ NzUberShaderInstance* NzUberShaderPreprocessor::Get(const NzParameterList& param
throw; throw;
} }
} }
else
return &shaderIt->second; return &shaderIt->second;
} }
void NzUberShaderPreprocessor::SetShader(nzShaderStage stage, const NzString& source, const NzString& shaderFlags, const NzString& requiredFlags) void NzUberShaderPreprocessor::SetShader(nzShaderStage stage, const NzString& source, const NzString& shaderFlags, const NzString& requiredFlags)