Browse Source

Don't forward-declare things for platforms where they aren't.

pull/217/head
Vladimír Vondruš 9 years ago
parent
commit
99483385e6
  1. 2
      src/Magnum/AbstractShaderProgram.h
  2. 8
      src/Magnum/Magnum.h

2
src/Magnum/AbstractShaderProgram.h

@ -482,7 +482,9 @@ comes in handy.
class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
friend Mesh; friend Mesh;
friend MeshView; friend MeshView;
#ifndef MAGNUM_TARGET_GLES2
friend TransformFeedback; friend TransformFeedback;
#endif
friend Implementation::ShaderProgramState; friend Implementation::ShaderProgramState;
public: public:

8
src/Magnum/Magnum.h

@ -504,7 +504,9 @@ using Math::Literals::operator "" _radf;
FramebufferTarget enums used only directly with framebuffer instance */ FramebufferTarget enums used only directly with framebuffer instance */
class AbstractFramebuffer; class AbstractFramebuffer;
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
class AbstractQuery; class AbstractQuery;
#endif
class AbstractShaderProgram; class AbstractShaderProgram;
class AbstractTexture; class AbstractTexture;
@ -592,7 +594,7 @@ enum class MeshPrimitive: GLenum;
class Mesh; class Mesh;
class MeshView; class MeshView;
#ifndef MAGNUM_TARGET_GLES2 #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
/* MultisampleTextureSampleLocations enum used only in the function */ /* MultisampleTextureSampleLocations enum used only in the function */
template<UnsignedInt> class MultisampleTexture; template<UnsignedInt> class MultisampleTexture;
typedef MultisampleTexture<2> MultisampleTexture2D; typedef MultisampleTexture<2> MultisampleTexture2D;
@ -619,7 +621,9 @@ class PrimitiveQuery;
class SampleQuery; class SampleQuery;
class TimeQuery; class TimeQuery;
#ifndef MAGNUM_TARGET_GLES
class RectangleTexture; class RectangleTexture;
#endif
class Renderbuffer; class Renderbuffer;
enum class RenderbufferFormat: GLenum; enum class RenderbufferFormat: GLenum;
@ -653,7 +657,9 @@ typedef TextureArray<2> Texture2DArray;
enum class TextureFormat: GLenum; enum class TextureFormat: GLenum;
#ifndef MAGNUM_TARGET_GLES2
class TransformFeedback; class TransformFeedback;
#endif
class Timeline; class Timeline;
enum class Version: Int; enum class Version: Int;

Loading…
Cancel
Save