Commit dedbf29b authored by Robert Menzel's avatar Robert Menzel

fixed OpenGLES defines

parent c6077eca
...@@ -184,7 +184,7 @@ public: ...@@ -184,7 +184,7 @@ public:
{ {
bind(); bind();
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _renderBuffer->getObjectName() ); glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _renderBuffer->getObjectName() );
#if (ACGL_OPENGLES_VERSION <= 20) #if (ACGL_OPENGLES_VERSION == 20)
if( _renderBuffer->getInternalFormat() == GL_DEPTH24_STENCIL8_OES || if( _renderBuffer->getInternalFormat() == GL_DEPTH24_STENCIL8_OES ||
_renderBuffer->getInternalFormat() == GL_DEPTH_STENCIL_OES) _renderBuffer->getInternalFormat() == GL_DEPTH_STENCIL_OES)
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _renderBuffer->getObjectName() ); glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _renderBuffer->getObjectName() );
...@@ -202,7 +202,7 @@ public: ...@@ -202,7 +202,7 @@ public:
{ {
bind(); bind();
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, _texture->getTarget(), _texture->getObjectName(), 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, _texture->getTarget(), _texture->getObjectName(), 0);
#if (ACGL_OPENGLES_VERSION <= 20) #if (ACGL_OPENGLES_VERSION == 20)
if( _texture->getInternalFormat() == GL_DEPTH24_STENCIL8_OES || if( _texture->getInternalFormat() == GL_DEPTH24_STENCIL8_OES ||
_texture->getInternalFormat() == GL_DEPTH_STENCIL_OES) _texture->getInternalFormat() == GL_DEPTH_STENCIL_OES)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, _texture->getTarget(), _texture->getObjectName(), 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, _texture->getTarget(), _texture->getObjectName(), 0);
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
#include <ACGL/OpenGL/Tools.hh> #include <ACGL/OpenGL/Tools.hh>
#include <ACGL/OpenGL/Debug.hh> #include <ACGL/OpenGL/Debug.hh>
#if (ACGL_OPENGLES_VERSION > 20) // only exclude ES 2 for now:
#if ((ACGL_OPENGLES_VERSION > 20) || (ACGL_OPENGL_VERSION > 20))
namespace ACGL{ namespace ACGL{
namespace OpenGL{ namespace OpenGL{
......
Markdown is supported
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