Browse Source

Fixed compilation on OpenGL ES.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
e213979559
  1. 2
      src/AbstractImage.h
  2. 1
      src/Buffer.h
  3. 8
      src/Mesh.h

2
src/AbstractImage.h

@ -19,6 +19,8 @@
* @brief Class Magnum::AbstractImage * @brief Class Magnum::AbstractImage
*/ */
#include <cstddef>
#include "Magnum.h" #include "Magnum.h"
#include "magnumVisibility.h" #include "magnumVisibility.h"

1
src/Buffer.h

@ -19,6 +19,7 @@
* @brief Class Magnum::Buffer * @brief Class Magnum::Buffer
*/ */
#include <cstddef>
#include <vector> #include <vector>
#include "Magnum.h" #include "Magnum.h"

8
src/Mesh.h

@ -75,6 +75,7 @@ class MAGNUM_EXPORT Mesh {
glFrontFace(static_cast<GLenum>(mode)); glFrontFace(static_cast<GLenum>(mode));
} }
#ifndef MAGNUM_TARGET_GLES
/** /**
* @brief Provoking vertex * @brief Provoking vertex
* *
@ -105,6 +106,7 @@ class MAGNUM_EXPORT Mesh {
inline static void setProvokingVertex(ProvokingVertex mode) { inline static void setProvokingVertex(ProvokingVertex mode) {
glProvokingVertex(static_cast<GLenum>(mode)); glProvokingVertex(static_cast<GLenum>(mode));
} }
#endif
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
/** /**
@ -155,7 +157,10 @@ class MAGNUM_EXPORT Mesh {
*/ */
enum class PolygonOffsetMode: GLenum { enum class PolygonOffsetMode: GLenum {
/** Offset filled polygons. */ /** Offset filled polygons. */
Fill = GL_POLYGON_OFFSET_FILL, Fill = GL_POLYGON_OFFSET_FILL
#ifndef MAGNUM_TARGET_GLES
,
/** /**
* Offset lines. * Offset lines.
@ -168,6 +173,7 @@ class MAGNUM_EXPORT Mesh {
* @requires_gl Only <tt>PolygonOffset::%Fill</tt> is supported. * @requires_gl Only <tt>PolygonOffset::%Fill</tt> is supported.
*/ */
Point = GL_POLYGON_OFFSET_POINT Point = GL_POLYGON_OFFSET_POINT
#endif
}; };
/** /**

Loading…
Cancel
Save