Commit 0df5175f authored by Robert Menzel's avatar Robert Menzel
Browse files

made VAO bind const again and added mac specific compile fix

parent d982422a
...@@ -200,9 +200,9 @@ public: ...@@ -200,9 +200,9 @@ public:
//! Bind this VAO //! Bind this VAO
//! If error checking is set to common or higher, some consistancy checks are made //! If error checking is set to common or higher, some consistancy checks are made
#ifdef ACGL_CHECK_COMMON_GL_ERRORS #ifdef ACGL_CHECK_COMMON_GL_ERRORS
void bind(); void bind() const;
#else #else
inline void bind() inline void bind() const
{ {
glBindVertexArray( mObjectName ); glBindVertexArray( mObjectName );
} }
......
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
#include <deque> #include <deque>
#include <assert.h> #include <assert.h>
#include <ACGL/OpenGL/GL.hh>
/*
*OpenGl will be already included by ACGL
#if defined(MACOS) #if defined(MACOS)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glext.h> #include <OpenGL/glext.h>
...@@ -28,6 +31,7 @@ ...@@ -28,6 +31,7 @@
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>
#endif #endif
*/
namespace nv_dds namespace nv_dds
{ {
......
...@@ -29,7 +29,7 @@ VertexArrayObject::VertexArrayObject( GLenum _mode ) : ...@@ -29,7 +29,7 @@ VertexArrayObject::VertexArrayObject( GLenum _mode ) :
} }
#ifdef ACGL_CHECK_COMMON_GL_ERRORS #ifdef ACGL_CHECK_COMMON_GL_ERRORS
void VertexArrayObject::bind() void VertexArrayObject::bind() const
{ {
glBindVertexArray( mObjectName ); glBindVertexArray( mObjectName );
......
...@@ -166,6 +166,7 @@ ...@@ -166,6 +166,7 @@
# define GET_EXT_POINTER(name, type) # define GET_EXT_POINTER(name, type)
#endif #endif
/*
#ifdef MACOS #ifdef MACOS
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glext.h> #include <OpenGL/glext.h>
...@@ -174,6 +175,7 @@ ...@@ -174,6 +175,7 @@
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>
#endif #endif
*/
#include <nv_dds/nv_dds.h> #include <nv_dds/nv_dds.h>
#include <cstdio> #include <cstdio>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment