Browse Source

Properly use C++11 enums everywhere.

pull/23/head
Vladimír Vondruš 13 years ago
parent
commit
64633793a3
  1. 4
      src/Query.h
  2. 2
      src/Renderer.h

4
src/Query.h

@ -144,7 +144,7 @@ UnsignedInt primitiveCount = q.result<UnsignedInt>();
class PrimitiveQuery: public AbstractQuery { class PrimitiveQuery: public AbstractQuery {
public: public:
/** @brief Query target */ /** @brief Query target */
enum Target: GLenum { enum class Target: GLenum {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
/** /**
* Count of primitives generated from vertex shader or geometry * Count of primitives generated from vertex shader or geometry
@ -210,7 +210,7 @@ q.endConditionalRender();
class SampleQuery: public AbstractQuery { class SampleQuery: public AbstractQuery {
public: public:
/** @brief Query target */ /** @brief Query target */
enum Target: GLenum { enum class Target: GLenum {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
/** /**
* Count of samples passed from fragment shader * Count of samples passed from fragment shader

2
src/Renderer.h

@ -278,7 +278,7 @@ class MAGNUM_EXPORT Renderer {
* *
* @see setFrontFace() * @see setFrontFace()
*/ */
enum FrontFace: GLenum { enum class FrontFace: GLenum {
/** @brief Counterclockwise polygons are front facing (default). */ /** @brief Counterclockwise polygons are front facing (default). */
CounterClockWise = GL_CCW, CounterClockWise = GL_CCW,

Loading…
Cancel
Save