Commit 88166cb2 authored by Guillaume Pasero's avatar Guillaume Pasero

WRG: pessimizing-move, fix noexcept

parent 08f17483
......@@ -39,7 +39,7 @@ Error
oss << "OpenGL error #" << code << ": '" << gluErrorString( code ) << "'";
return std::move( oss.str() );
return oss.str();
}()
)
{
......
......@@ -49,7 +49,7 @@ MakeTexturedQuad( Id_t xy, Id_t uv )
mesh.VertexAttribPointer( xy, 2, 0 );
mesh.VertexAttribPointer( uv, 2, 8 );
return std::move( mesh );
return mesh;
}
......@@ -75,7 +75,7 @@ MakeInterleavedTexturedQuad( Id_t xy, Id_t uv )
mesh.VertexAttribPointer( xy, 2, 0 );
mesh.VertexAttribPointer( uv, 2, 2 );
return std::move( mesh );
return mesh;
}
Mesh
......@@ -99,7 +99,7 @@ MakeQuad( Id_t xy)
mesh.VertexAttribPointer( xy, 2, 0 );
return std::move( mesh );
return mesh;
}
void
......
......@@ -40,7 +40,7 @@ const char * GlVersionChecker::REQUIRED_GLSL_VERSION = "1.30";
const char *
GlVersionChecker
::GLVersion() noexcept
::GLVersion()
{
const GLubyte * glVersionStr = glGetString( GL_VERSION );
......@@ -61,7 +61,7 @@ GlVersionChecker
const char *
GlVersionChecker
::GLSLVersion() noexcept
::GLSLVersion()
{
const GLubyte * slVersionStr = glGetString( GL_SHADING_LANGUAGE_VERSION );
......@@ -82,7 +82,7 @@ GlVersionChecker
bool
GlVersionChecker
::CheckGLCapabilities() noexcept
::CheckGLCapabilities()
{
char const * glVersion = nullptr;
char const * glslVersion = nullptr;
......@@ -93,7 +93,7 @@ GlVersionChecker
bool
GlVersionChecker
::CheckGLCapabilities( const char * & glVersion, const char * & glslVersion ) noexcept
::CheckGLCapabilities( const char * & glVersion, const char * & glslVersion )
{
// Get OpenGL version.
glVersion = GlVersionChecker::GLVersion();
......@@ -185,7 +185,7 @@ GlVersionChecker
int
GlVersionChecker
::VerCmp( const char * version, const char * required ) noexcept
::VerCmp( const char * version, const char * required )
{
//
// Split version.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment