Implemented glBindBufferBase and glBindBufferRange.

TRAC #22753 Signed-off-by: Jamie Madill Signed-off-by: Nicolas Capens Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2112 736b8ea6-26fd-11df-bfd4-992fa37f6226

Implemented glBindBufferBase and glBindBufferRange.
d4e61972 · shannon.woods%transgaming.com@gtempaccount.com · 34089354 · d4e61972
Commit d4e61972 authored Apr 13, 2013 by shannon.woods%transgaming.com@gtempaccount.com
Hide whitespace changes
Inline Side-by-side

Showing with 87 additions and 4 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +87 -4

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -7731,9 +7731,53 @@ void __stdcall glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLi
            {
                return gl::error(GL_INVALID_OPERATION);
            }
-        }
-        UNIMPLEMENTED();
+            switch (target)
+            {
+              case GL_TRANSFORM_FEEDBACK_BUFFER:
+                if (index > context->getMaxTransformFeedbackBufferBindings())
+                {
+                    return gl::error(GL_INVALID_VALUE);
+                }
+                break;
+              case GL_UNIFORM_BUFFER:
+                if (index >= context->getMaximumCombinedUniformBufferBindings())
+                {
+                    return gl::error(GL_INVALID_VALUE);
+                }
+                break;
+              default:
+                return gl::error(GL_INVALID_ENUM);
+            }
+            gl::Buffer *bufferObject = context->getBuffer(buffer);
+            if (!bufferObject)
+            {
+                // Buffer index must not have been valid
+                return gl::error(GL_INVALID_VALUE);
+            }
+            if (size <= 0 || static_cast<unsigned int>(offset + size) > bufferObject->size())
+            {
+                return gl::error(GL_INVALID_VALUE);
+            }
+            switch (target)
+            {
+              case GL_TRANSFORM_FEEDBACK_BUFFER:
+                context->bindTransformFeedbackBuffer(buffer, index, offset, size);
+                break;
+              case GL_UNIFORM_BUFFER:
+                context->bindUniformBuffer(buffer, index, offset, size);
+                break;
+              default:
+                UNREACHABLE();
+            }
+        }
    }
    catch(std::bad_alloc&)
    {
@@ -7756,9 +7800,48 @@ void __stdcall glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
            {
                return gl::error(GL_INVALID_OPERATION);
            }
-        }
-        UNIMPLEMENTED();
+            switch (target)
+            {
+              case GL_TRANSFORM_FEEDBACK_BUFFER:
+                if (index > context->getMaxTransformFeedbackBufferBindings())
+                {
+                    return gl::error(GL_INVALID_VALUE);
+                }
+                break;
+              case GL_UNIFORM_BUFFER:
+                if (index > context->getMaximumCombinedUniformBufferBindings())
+                {
+                    return gl::error(GL_INVALID_VALUE);
+                }
+                break;
+              default:
+                return gl::error(GL_INVALID_ENUM);
+            }
+            gl::Buffer *bufferObject = context->getBuffer(buffer);
+            if (!bufferObject)
+            {
+                // Buffer index must not have been valid
+                return gl::error(GL_INVALID_VALUE);
+            }
+            switch (target)
+            {
+              case GL_TRANSFORM_FEEDBACK_BUFFER:
+                context->bindTransformFeedbackBuffer(buffer, index, 0, -1);
+                break;
+              case GL_UNIFORM_BUFFER:
+                context->bindUniformBuffer(buffer, index, 0, -1);
+                break;
+              default:
+                UNREACHABLE();
+            }
+        }
    }
    catch(std::bad_alloc&)
    {