Browse Source

GCC 4.6 compilation fixes.

pull/7/head
Vladimír Vondruš 14 years ago
parent
commit
29a07c7d62
  1. 1
      src/Platform/magnum-info.cpp
  2. 4
      src/Renderbuffer.h
  3. 2
      src/Shaders/AbstractTextShader.h
  4. 2
      src/Shaders/FlatShader.cpp
  5. 4
      src/Shaders/FlatShader.h
  6. 2
      src/Shaders/PhongShader.cpp
  7. 18
      src/Shaders/PhongShader.h
  8. 2
      src/Shaders/TextShader.cpp
  9. 4
      src/Shaders/TextShader.h
  10. 2
      src/Shaders/VertexColorShader.cpp
  11. 2
      src/Shaders/VertexColorShader.h

1
src/Platform/magnum-info.cpp

@ -14,6 +14,7 @@
*/
#include <Utility/Debug.h>
#include <corradeCompatibility.h>
#include "Context.h"
#include "Platform/WindowlessGlxApplication.h"

4
src/Renderbuffer.h

@ -503,7 +503,7 @@ class MAGNUM_EXPORT Renderbuffer {
* @requires_gles30 %Extension @es_extension{OES,packed_depth_stencil}
*/
#ifdef MAGNUM_TARGET_GLES2
Depth24Stencil8 = GL_DEPTH24_STENCIL8_OES,
Depth24Stencil8 = GL_DEPTH24_STENCIL8_OES
#else
Depth24Stencil8 = GL_DEPTH24_STENCIL8,
@ -513,7 +513,7 @@ class MAGNUM_EXPORT Renderbuffer {
* @requires_gles30 Only integral depth textures are available in
* OpenGL ES 2.0.
*/
Depth32FStencil8 = GL_DEPTH32F_STENCIL8,
Depth32FStencil8 = GL_DEPTH32F_STENCIL8
#endif
};

2
src/Shaders/AbstractTextShader.h

@ -39,7 +39,7 @@ template<std::uint8_t dimensions> class AbstractTextShader: public AbstractShade
typedef Attribute<1, Vector2> TextureCoordinates;
enum: GLint {
FontTextureLayer = 16, /**< @brief Layer for font texture */
FontTextureLayer = 16 /**< @brief Layer for font texture */
};
~AbstractTextShader() = 0;

2
src/Shaders/FlatShader.cpp

@ -36,7 +36,7 @@ namespace {
};
}
template<std::uint8_t dimensions> FlatShader<dimensions>::FlatShader() {
template<std::uint8_t dimensions> FlatShader<dimensions>::FlatShader(): transformationProjectionMatrixUniform(0), colorUniform(1) {
Corrade::Utility::Resource rs("MagnumShaders");
#ifndef MAGNUM_TARGET_GLES

4
src/Shaders/FlatShader.h

@ -61,8 +61,8 @@ template<std::uint8_t dimensions> class MAGNUM_SHADERS_EXPORT FlatShader: public
}
private:
GLint transformationProjectionMatrixUniform = 0,
colorUniform = 1;
GLint transformationProjectionMatrixUniform,
colorUniform;
};
/** @brief 2D flat shader */

2
src/Shaders/PhongShader.cpp

@ -22,7 +22,7 @@
namespace Magnum { namespace Shaders {
PhongShader::PhongShader() {
PhongShader::PhongShader(): transformationMatrixUniform(0), projectionMatrixUniform(1), normalMatrixUniform(2), lightUniform(3), diffuseColorUniform(4), ambientColorUniform(5), specularColorUniform(6), lightColorUniform(7), shininessUniform(8) {
Corrade::Utility::Resource rs("MagnumShaders");
#ifndef MAGNUM_TARGET_GLES

18
src/Shaders/PhongShader.h

@ -123,15 +123,15 @@ class MAGNUM_SHADERS_EXPORT PhongShader: public AbstractShaderProgram {
}
private:
GLint transformationMatrixUniform = 0,
projectionMatrixUniform = 1,
normalMatrixUniform = 2,
lightUniform = 3,
diffuseColorUniform = 4,
ambientColorUniform = 5,
specularColorUniform = 6,
lightColorUniform = 7,
shininessUniform = 8;
GLint transformationMatrixUniform,
projectionMatrixUniform,
normalMatrixUniform,
lightUniform,
diffuseColorUniform,
ambientColorUniform,
specularColorUniform,
lightColorUniform,
shininessUniform;
};
}}

2
src/Shaders/TextShader.cpp

@ -37,7 +37,7 @@ namespace {
};
}
template<std::uint8_t dimensions> TextShader<dimensions>::TextShader() {
template<std::uint8_t dimensions> TextShader<dimensions>::TextShader(): transformationProjectionMatrixUniform(0), colorUniform(1) {
Corrade::Utility::Resource rs("MagnumShaders");
#ifndef MAGNUM_TARGET_GLES

4
src/Shaders/TextShader.h

@ -49,8 +49,8 @@ template<std::uint8_t dimensions> class MAGNUM_SHADERS_EXPORT TextShader: public
}
private:
GLint transformationProjectionMatrixUniform = 0,
colorUniform = 1;
GLint transformationProjectionMatrixUniform,
colorUniform;
};
/** @brief Two-dimensional text shader */

2
src/Shaders/VertexColorShader.cpp

@ -36,7 +36,7 @@ namespace {
};
}
template<std::uint8_t dimensions> VertexColorShader<dimensions>::VertexColorShader() {
template<std::uint8_t dimensions> VertexColorShader<dimensions>::VertexColorShader(): transformationProjectionMatrixUniform(0) {
Corrade::Utility::Resource rs("MagnumShaders");
#ifndef MAGNUM_TARGET_GLES

2
src/Shaders/VertexColorShader.h

@ -55,7 +55,7 @@ template<std::uint8_t dimensions> class MAGNUM_SHADERS_EXPORT VertexColorShader:
}
private:
GLint transformationProjectionMatrixUniform = 0;
GLint transformationProjectionMatrixUniform;
};
/** @brief 2D vertex color shader */

Loading…
Cancel
Save