Commits

David Rogers  committed ccc8284

GLES: Use _OgreGLESExport instead of _OgrePrivate to control symbol visibility for rendersystem classes.

  • Participants
  • Parent commits 9bc3487
  • Branches v1-7

Comments (0)

Files changed (18)

File RenderSystems/GLES/include/OgreGLESContext.h

      * This object can also be used to cache renderstate if we decide to do so
      * in the future.
      */
-    class _OgrePrivate GLESContext
+    class _OgreGLESExport GLESContext
     {
         public:
             GLESContext();

File RenderSystems/GLES/include/OgreGLESDefaultHardwareBufferManager.h

 
 namespace Ogre {
     /// Specialisation of HardwareVertexBuffer for emulation
-    class _OgrePrivate GLESDefaultHardwareVertexBuffer : public HardwareVertexBuffer
+    class _OgreGLESExport GLESDefaultHardwareVertexBuffer : public HardwareVertexBuffer
     {
         protected:
             unsigned char* mpData;
     };
 
     /// Specialisation of HardwareIndexBuffer for emulation
-    class _OgrePrivate GLESDefaultHardwareIndexBuffer : public HardwareIndexBuffer
+    class _OgreGLESExport GLESDefaultHardwareIndexBuffer : public HardwareIndexBuffer
     {
         protected:
             unsigned char* mpData;
         rendering system (which is required to create a 'real' hardware
         buffer manager.
     */
-    class _OgrePrivate GLESDefaultHardwareBufferManagerBase : public HardwareBufferManagerBase
+    class _OgreGLESExport GLESDefaultHardwareBufferManagerBase : public HardwareBufferManagerBase
     {
         public:
             GLESDefaultHardwareBufferManagerBase();
     };
 
 	/// GLESDefaultHardwareBufferManagerBase as a Singleton
-	class _OgrePrivate GLESDefaultHardwareBufferManager : public HardwareBufferManager
+	class _OgreGLESExport GLESDefaultHardwareBufferManager : public HardwareBufferManager
 	{
 	public:
 		GLESDefaultHardwareBufferManager()

File RenderSystems/GLES/include/OgreGLESFBOMultiRenderTarget.h

 
 	/** MultiRenderTarget for GL ES. Requires the FBO extension.
 	*/
-	class _OgrePrivate GLESFBOMultiRenderTarget : public MultiRenderTarget
+	class _OgreGLESExport GLESFBOMultiRenderTarget : public MultiRenderTarget
 	{
 	public:
 		GLESFBOMultiRenderTarget(GLESFBOManager *manager, const String &name);

File RenderSystems/GLES/include/OgreGLESFBORenderTexture.h

 
     /** RenderTexture for GL ES FBO
     */
-    class _OgrePrivate GLESFBORenderTexture: public GLESRenderTexture
+    class _OgreGLESExport GLESFBORenderTexture: public GLESRenderTexture
     {
     public:
         GLESFBORenderTexture(GLESFBOManager *manager, const String &name, const GLESSurfaceDesc &target, bool writeGamma, uint fsaa);
     
     /** Factory for GL Frame Buffer Objects, and related things.
     */
-    class _OgrePrivate GLESFBOManager: public GLESRTTManager
+    class _OgreGLESExport GLESFBOManager: public GLESRTTManager
     {
     public:
         GLESFBOManager();

File RenderSystems/GLES/include/OgreGLESFrameBufferObject.h

 
     /** Frame Buffer Object abstraction.
     */
-    class _OgrePrivate GLESFrameBufferObject
+    class _OgreGLESExport GLESFrameBufferObject
     {
     public:
         GLESFrameBufferObject(GLESFBOManager *manager, uint fsaa);

File RenderSystems/GLES/include/OgreGLESGpuProgramManager.h

 #ifndef __GLESGpuProgramManager_H__
 #define __GLESGpuProgramManager_H__
 
+#include "OgreGLESPrerequisites.h"
+
 #include "OgreGpuProgramManager.h"
 
 namespace Ogre {
-    class _OgrePrivate GLESGpuProgramManager : public GpuProgramManager
+    class _OgreGLESExport GLESGpuProgramManager : public GpuProgramManager
     {
         public:
             typedef GpuProgram* (*CreateGpuProgramCallback)(ResourceManager* creator,

File RenderSystems/GLES/include/OgreGLESHardwareBufferManager.h

     #   define OGRE_GL_MAP_BUFFER_THRESHOLD (1024 * 32)
 
     /** Implementation of HardwareBufferManager for OpenGL ES. */
-    class _OgrePrivate GLESHardwareBufferManagerBase : public HardwareBufferManagerBase
+    class _OgreGLESExport GLESHardwareBufferManagerBase : public HardwareBufferManagerBase
     {
         protected:
             char* mScratchBufferPool;
             */
             const size_t getGLMapBufferThreshold() const;
             void setGLMapBufferThreshold( const size_t value );
-};
+    };
 
 	/// GLESHardwareBufferManagerBase as a Singleton
-	class _OgrePrivate GLESHardwareBufferManager : public HardwareBufferManager
+	class _OgreGLESExport GLESHardwareBufferManager : public HardwareBufferManager
 	{
 	public:
 		GLESHardwareBufferManager()

File RenderSystems/GLES/include/OgreGLESHardwareIndexBuffer.h

 #include "OgreHardwareIndexBuffer.h"
 
 namespace Ogre {
-    class _OgrePrivate GLESHardwareIndexBuffer : public HardwareIndexBuffer
+    class _OgreGLESExport GLESHardwareIndexBuffer : public HardwareIndexBuffer
     {
         private:
             GLuint mBufferId;

File RenderSystems/GLES/include/OgreGLESHardwarePixelBuffer.h

 #include "OgreHardwarePixelBuffer.h"
 
 namespace Ogre {
-    class _OgrePrivate GLESHardwarePixelBuffer: public HardwarePixelBuffer
+    class _OgreGLESExport GLESHardwarePixelBuffer: public HardwarePixelBuffer
     {
         protected:
             /// Lock a box
 
     /** Texture surface.
     */
-    class _OgrePrivate GLESTextureBuffer: public GLESHardwarePixelBuffer
+    class _OgreGLESExport GLESTextureBuffer: public GLESHardwarePixelBuffer
     {
         public:
             /** Texture constructor */
 
      /** Renderbuffer surface.  Needs FBO extension.
      */
-    class _OgrePrivate GLESRenderBuffer: public GLESHardwarePixelBuffer
+    class _OgreGLESExport GLESRenderBuffer: public GLESHardwarePixelBuffer
     {
         public:
             GLESRenderBuffer(GLenum format, size_t width, size_t height, GLsizei numSamples);

File RenderSystems/GLES/include/OgreGLESHardwareVertexBuffer.h

 
 namespace Ogre {
     /// Specialisation of HardwareVertexBuffer for OpenGL ES
-    class _OgrePrivate GLESHardwareVertexBuffer : public HardwareVertexBuffer
+    class _OgreGLESExport GLESHardwareVertexBuffer : public HardwareVertexBuffer
     {
         private:
             GLuint mBufferId;

File RenderSystems/GLES/include/OgreGLESPBRenderTexture.h

     class GLESPBRTTManager;
     class GLESPBuffer;
     class GLESContext;
-    class _OgrePrivate GLESPBRenderTexture: public GLESRenderTexture
+    class _OgreGLESExport GLESPBRenderTexture: public GLESRenderTexture
     {
         public:
             GLESPBRenderTexture(GLESPBRTTManager *manager, const String &name, const GLESSurfaceDesc &target, bool writeGamma, uint fsaa);
 
     /** Manager for rendertextures and PBuffers (offscreen rendering contexts)
     */
-    class _OgrePrivate GLESPBRTTManager: public GLESRTTManager
+    class _OgreGLESExport GLESPBRTTManager: public GLESRTTManager
     {
         public:
             GLESPBRTTManager(GLESSupport *support, RenderTarget *mainwindow);

File RenderSystems/GLES/include/OgreGLESPBuffer.h

         convience, but the component format is configurable.
     */
     class GLESContext;
-    class _OgrePrivate GLESPBuffer
+    class _OgreGLESExport GLESPBuffer
     {
         public:
             GLESPBuffer(PixelComponentType format, size_t width, size_t height);

File RenderSystems/GLES/include/OgreGLESPixelFormat.h

     /**
     * Class to do pixel format mapping between GL and OGRE
     */
-    class _OgrePrivate GLESPixelUtil
+    class _OgreGLESExport GLESPixelUtil
     {
         public:
             /** Takes the OGRE pixel format and returns the appropriate GL one

File RenderSystems/GLES/include/OgreGLESPrerequisites.h

         fprintf(stderr, "%s:%d: %s\n", __FUNCTION__, __LINE__, text); \
     }
 
-#define ENABLE_GL_CHECK 0
+#define ENABLE_GL_CHECK 1
 #if ENABLE_GL_CHECK
 #define GL_CHECK_ERROR \
     { \

File RenderSystems/GLES/include/OgreGLESRenderSystem.h

     /**
       Implementation of GL as a rendering system.
      */
-    class _OgrePrivate GLESRenderSystem : public RenderSystem
+    class _OgreGLESExport GLESRenderSystem : public RenderSystem
     {
         private:
 

File RenderSystems/GLES/include/OgreGLESRenderTexture.h

 
     /** GL surface descriptor. Points to a 2D surface that can be rendered to.
     */
-    struct _OgrePrivate GLESSurfaceDesc
+    struct _OgreGLESExport GLESSurfaceDesc
     {
         public:
             GLESHardwarePixelBuffer *buffer;
 
     /** Base class for GL Render Textures
     */
-    class _OgrePrivate GLESRenderTexture : public RenderTexture
+    class _OgreGLESExport GLESRenderTexture : public RenderTexture
     {
         public:
             GLESRenderTexture(const String &name, const GLESSurfaceDesc &target, bool writeGamma, uint fsaa);
 
     /** Manager/factory for RenderTextures.
     */
-    class _OgrePrivate GLESRTTManager : public Singleton<GLESRTTManager>
+    class _OgreGLESExport GLESRTTManager : public Singleton<GLESRTTManager>
     {
         public:
             virtual ~GLESRTTManager();
     /** RenderTexture for simple copying from frame buffer
     */
     class GLESCopyingRTTManager;
-    class _OgrePrivate GLESCopyingRenderTexture : public GLESRenderTexture
+    class _OgreGLESExport GLESCopyingRenderTexture : public GLESRenderTexture
     {
         public:
             GLESCopyingRenderTexture(GLESCopyingRTTManager *manager,
     /** Simple, copying manager/factory for RenderTextures. This is only used as the last fallback if
         both PBuffers and FBOs aren't supported.
     */
-    class _OgrePrivate GLESCopyingRTTManager : public GLESRTTManager
+    class _OgreGLESExport GLESCopyingRTTManager : public GLESRTTManager
     {
         public:
             GLESCopyingRTTManager();

File RenderSystems/GLES/include/OgreGLESTexture.h

 #include "OgreHardwarePixelBuffer.h"
 
 namespace Ogre {
-    class _OgrePrivate GLESTexture : public Texture
+    class _OgreGLESExport GLESTexture : public Texture
     {
         public:
             // Constructor
     except to do so requires a form VC6 does not support i.e.
     ResourceSubclassPtr<T> : public SharedPtr<T>
     */
-    class _OgrePrivate GLESTexturePtr : public SharedPtr<GLESTexture>
+    class _OgreGLESExport GLESTexturePtr : public SharedPtr<GLESTexture>
     {
         public:
             GLESTexturePtr() : SharedPtr<GLESTexture>() {}

File RenderSystems/GLES/include/OgreGLESTextureManager.h

 
 namespace Ogre {
     /** GL ES-specific implementation of a TextureManager */
-    class _OgrePrivate GLESTextureManager : public TextureManager
+    class _OgreGLESExport GLESTextureManager : public TextureManager
     {
         public:
             GLESTextureManager(GLESSupport& support);