Skip to content
Browse files

Merge branch '1.4'

  • Loading branch information...
2 parents 539b078 + 970a138 commit a6cf4d872a5b2b8a60b1fd68efa1b806c434bec5 @eile eile committed
Showing with 4 additions and 2 deletions.
  1. +1 −0 libs/eq/util/objectManager.ipp
  2. +1 −0 libs/eq/util/pixelBufferObject.cpp
  3. +2 −2 libs/eq/util/pixelBufferObject.h
View
1 libs/eq/util/objectManager.ipp
@@ -28,6 +28,7 @@
# include "gpuCompressor.h"
#endif
+#include <eq/client/gl.h>
#include <string.h>
// instantiate desired key types -- see objectManager.cpp
View
1 libs/eq/util/pixelBufferObject.cpp
@@ -19,6 +19,7 @@
#include "pixelBufferObject.h"
#include <eq/client/error.h>
+#include <eq/client/gl.h>
#include <lunchbox/debug.h>
#include <lunchbox/scopedMutex.h>
View
4 libs/eq/util/pixelBufferObject.h
@@ -67,7 +67,7 @@ namespace detail { class PixelBufferObject; }
* @return true on success, false otherwise
* @version 1.3
*/
- EQ_API virtual bool setup( const size_t size, const GLuint type );
+ EQ_API virtual bool setup( const size_t size, const unsigned type );
/** Unbind and de-initialize the pixel buffer object. @version 1.3 */
EQ_API virtual void destroy();
@@ -115,7 +115,7 @@ namespace detail { class PixelBufferObject; }
EQ_API bool isThreadSafe() const;
/** @return OpenGL ID @version 1.3.2 */
- GLuint getID() const;
+ unsigned getID() const;
private:
detail::PixelBufferObject* const _impl;

0 comments on commit a6cf4d8

Please sign in to comment.
Something went wrong with that request. Please try again.