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

Added move constructor/operator to Shader 

Former-commit-id: b947e0ac0dcddcfe64c83b63cf89df0e0850cbd2
This commit is contained in:
Lynix 2013-01-08 17:31:42 +01:00
parent e194d11374
commit e6cef2ddbf
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Renderer/Shader.hpp
View File

@ -28,6 +28,7 @@ class NAZARA_API NzShader : public NzResource, NzNonCopyable
public: public:
NzShader() = default; NzShader() = default;
NzShader(nzShaderLanguage language); NzShader(nzShaderLanguage language);
NzShader(NzShader&& shader);
~NzShader(); ~NzShader();
bool Create(nzShaderLanguage language); bool Create(nzShaderLanguage language);
@ -68,6 +69,8 @@ class NAZARA_API NzShader : public NzResource, NzNonCopyable
void Unlock(); void Unlock();
NzShader& operator=(NzShader&& shader);
static bool IsLanguageSupported(nzShaderLanguage language); static bool IsLanguageSupported(nzShaderLanguage language);
static bool IsTypeSupported(nzShaderType type); static bool IsTypeSupported(nzShaderType type);

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

@ -19,6 +19,12 @@ NzShader::NzShader(nzShaderLanguage language)
Create(language); Create(language);
} }
NzShader::NzShader(NzShader&& shader) :
m_impl(shader.m_impl)
{
shader.m_impl = nullptr;
}
NzShader::~NzShader() NzShader::~NzShader()
{ {
Destroy(); Destroy();
@ -609,6 +615,16 @@ void NzShader::Unlock()
return m_impl->Unlock(); return m_impl->Unlock();
} }
NzShader& NzShader::operator=(NzShader&& shader)
{
Destroy();
m_impl = shader.m_impl;
shader.m_impl = nullptr;
return *this;
}
bool NzShader::IsLanguageSupported(nzShaderLanguage language) bool NzShader::IsLanguageSupported(nzShaderLanguage language)
{ {
switch (language) switch (language)