Commit dd3ce1b8 authored by hybrid's avatar hybrid

Fixed some missing returns in OpenGL driver.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1061 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 4dc79e88
...@@ -1400,7 +1400,7 @@ inline void COpenGLExtensionHandler::extGlDeleteBuffers(GLsizei n, const GLuint ...@@ -1400,7 +1400,7 @@ inline void COpenGLExtensionHandler::extGlDeleteBuffers(GLsizei n, const GLuint
#endif #endif
} }
inline void COpenGLExtensionHandler::extGlBufferSubData (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data) inline void COpenGLExtensionHandler::extGlBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlBufferSubDataARB) if (pGlBufferSubDataARB)
...@@ -1412,7 +1412,7 @@ inline void COpenGLExtensionHandler::extGlBufferSubData (GLenum target, GLintptr ...@@ -1412,7 +1412,7 @@ inline void COpenGLExtensionHandler::extGlBufferSubData (GLenum target, GLintptr
#endif #endif
} }
inline void COpenGLExtensionHandler::extGlGetBufferSubData (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data) inline void COpenGLExtensionHandler::extGlGetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetBufferSubDataARB) if (pGlGetBufferSubDataARB)
...@@ -1424,15 +1424,17 @@ inline void COpenGLExtensionHandler::extGlGetBufferSubData (GLenum target, GLint ...@@ -1424,15 +1424,17 @@ inline void COpenGLExtensionHandler::extGlGetBufferSubData (GLenum target, GLint
#endif #endif
} }
inline void *COpenGLExtensionHandler::extGlMapBuffer (GLenum target, GLenum access) inline void *COpenGLExtensionHandler::extGlMapBuffer(GLenum target, GLenum access)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlMapBufferARB) if (pGlMapBufferARB)
pGlMapBufferARB(target, access); return pGlMapBufferARB(target, access);
return 0;
#elif defined(GL_ARB_vertex_buffer_object) #elif defined(GL_ARB_vertex_buffer_object)
glMapBuffer(target, access); return glMapBuffer(target, access);
#else #else
os::Printer::log("glMapBuffer not supported", ELL_ERROR); os::Printer::log("glMapBuffer not supported", ELL_ERROR);
return 0;
#endif #endif
} }
...@@ -1440,11 +1442,13 @@ inline GLboolean COpenGLExtensionHandler::extGlUnmapBuffer (GLenum target) ...@@ -1440,11 +1442,13 @@ inline GLboolean COpenGLExtensionHandler::extGlUnmapBuffer (GLenum target)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlUnmapBufferARB) if (pGlUnmapBufferARB)
pGlUnmapBufferARB(target); return pGlUnmapBufferARB(target);
return false;
#elif defined(GL_ARB_vertex_buffer_object) #elif defined(GL_ARB_vertex_buffer_object)
glUnmapBuffer(target); return glUnmapBuffer(target);
#else #else
os::Printer::log("glUnmapBuffer not supported", ELL_ERROR); os::Printer::log("glUnmapBuffer not supported", ELL_ERROR);
return false;
#endif #endif
} }
...@@ -1452,11 +1456,13 @@ inline GLboolean COpenGLExtensionHandler::extGlIsBuffer (GLuint buffer) ...@@ -1452,11 +1456,13 @@ inline GLboolean COpenGLExtensionHandler::extGlIsBuffer (GLuint buffer)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlIsBufferARB) if (pGlIsBufferARB)
pGlIsBufferARB(buffer); return pGlIsBufferARB(buffer);
return false;
#elif defined(GL_ARB_vertex_buffer_object) #elif defined(GL_ARB_vertex_buffer_object)
glIsBuffer(buffer); return glIsBuffer(buffer);
#else #else
os::Printer::log("glDeleteBuffers not supported", ELL_ERROR); os::Printer::log("glDeleteBuffers not supported", ELL_ERROR);
return false;
#endif #endif
} }
...@@ -1490,4 +1496,3 @@ inline void COpenGLExtensionHandler::extGlGetBufferPointerv (GLenum target, GLen ...@@ -1490,4 +1496,3 @@ inline void COpenGLExtensionHandler::extGlGetBufferPointerv (GLenum target, GLen
#endif #endif
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