Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ACGL
acgl
Commits
dedbf29b
Commit
dedbf29b
authored
Oct 20, 2015
by
Robert Menzel
Browse files
fixed OpenGLES defines
parent
c6077eca
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/ACGL/OpenGL/Objects/FrameBufferObject.hh
View file @
dedbf29b
...
...
@@ -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
);
...
...
include/ACGL/OpenGL/Objects/Query.hh
View file @
dedbf29b
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment