From dedbf29b8d80fc465db3c4ce6f10255b63a5b024 Mon Sep 17 00:00:00 2001
From: Robert Menzel <menzel@informatik.rwth-aachen.de>
Date: Tue, 20 Oct 2015 10:32:58 +0200
Subject: [PATCH] fixed OpenGLES defines
---
include/ACGL/OpenGL/Objects/FrameBufferObject.hh | 4 ++--
include/ACGL/OpenGL/Objects/Query.hh | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/ACGL/OpenGL/Objects/FrameBufferObject.hh b/include/ACGL/OpenGL/Objects/FrameBufferObject.hh
index 3ce12553..a6b60ebe 100644
--- a/include/ACGL/OpenGL/Objects/FrameBufferObject.hh
+++ b/include/ACGL/OpenGL/Objects/FrameBufferObject.hh
@@ -184,7 +184,7 @@ public:
{
bind();
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 ||
_renderBuffer->getInternalFormat() == GL_DEPTH_STENCIL_OES)
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _renderBuffer->getObjectName() );
@@ -202,7 +202,7 @@ public:
{
bind();
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 ||
_texture->getInternalFormat() == GL_DEPTH_STENCIL_OES)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, _texture->getTarget(), _texture->getObjectName(), 0);
diff --git a/include/ACGL/OpenGL/Objects/Query.hh b/include/ACGL/OpenGL/Objects/Query.hh
index bb394e4f..8d0b5eef 100644
--- a/include/ACGL/OpenGL/Objects/Query.hh
+++ b/include/ACGL/OpenGL/Objects/Query.hh
@@ -14,7 +14,8 @@
#include <ACGL/OpenGL/Tools.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 OpenGL{
--
GitLab