OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0026908: Visualization, TKOpenGl - eliminate -Wunused-parameter compiler warnings for Android target

Browse Source 
Support TBO on OpenGL ES 3.2+
This commit is contained in:
isk
2015-12-15 10:58:58 +03:00
committed by abv
parent e9312c0fc2
commit 20aeeb7be3
13 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/OpenGl/OpenGl_TextureBufferArb.cxx
View File

@@ -47,7 +47,7 @@ OpenGl_TextureBufferArb::~OpenGl_TextureBufferArb()
// =======================================================================
GLenum OpenGl_TextureBufferArb::GetTarget() const
{
return GL_TEXTURE_BUFFER_ARB; // GL_TEXTURE_BUFFER for OpenGL 3.1+
return GL_TEXTURE_BUFFER; // GL_TEXTURE_BUFFER for OpenGL 3.1+, OpenGL ES 3.2
}
// =======================================================================
@@ -98,9 +98,12 @@ bool OpenGl_TextureBufferArb::Init (const Handle(OpenGl_Context)& theGlCtx,
const GLsizei theElemsNb,
const GLfloat* theData)
{
#if !defined(GL_ES_VERSION_2_0)
if (theComponentsNb < 1
|| theComponentsNb > 4)
if (theGlCtx->arbTBO == NULL)
{
return false;
}
else if (theComponentsNb < 1
|| theComponentsNb > 4)
{
// unsupported format
return false;
@@ -130,9 +133,6 @@ bool OpenGl_TextureBufferArb::Init (const Handle(OpenGl_Context)& theGlCtx,
UnbindTexture (theGlCtx);
Unbind (theGlCtx);
return true;
#else
return false;
#endif
}
// =======================================================================
@@ -144,9 +144,12 @@ bool OpenGl_TextureBufferArb::Init (const Handle(OpenGl_Context)& theGlCtx,
const GLsizei theElemsNb,
const GLuint* theData)
{
#if !defined(GL_ES_VERSION_2_0)
if (theComponentsNb < 1
|| theComponentsNb > 4)
if (theGlCtx->arbTBO == NULL)
{
return false;
}
else if (theComponentsNb < 1
|| theComponentsNb > 4)
{
// unsupported format
return false;
@@ -176,9 +179,6 @@ bool OpenGl_TextureBufferArb::Init (const Handle(OpenGl_Context)& theGlCtx,
UnbindTexture (theGlCtx);
Unbind (theGlCtx);
return true;
#else
return false;
#endif
}
// =======================================================================