commit d3e7aa33e04f7215a69abeec6b9004662aadb155
author Minmin Gong <mgong@microsoft.com> Mon Jun 29 12:25:24 2015 -0700
committer Jamie Madill <jmadill@chromium.org> Tue Jun 30 17:15:04 2015 +0000
tree f68891b75ca150995875d968f8208f05a3f67493
parent 006909d692edae060035c366a8a9f622aab08f77

Allow calling HandleAllocator::reserve with MAX_UINT.

BUG=angleproject:1052

Change-Id: I03883799ef334f39c9e855a0a4b7af1ab02d5da9
Reviewed-on: https://chromium-review.googlesource.com/282414
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Minmin Gong <mgong@microsoft.com>

src/libANGLE/HandleAllocator.cpp

diff --git a/src/libANGLE/HandleAllocator.cpp b/src/libANGLE/HandleAllocator.cpp
index 59d3966..1b9162a 100644
--- a/src/libANGLE/HandleAllocator.cpp
+++ b/src/libANGLE/HandleAllocator.cpp
@@ -26,7 +26,7 @@
 
 HandleAllocator::HandleAllocator() : mBaseValue(1), mNextValue(1)
 {
-    mUnallocatedList.push_back(HandleRange(1, std::numeric_limits<GLuint>::max() - 1));
+    mUnallocatedList.push_back(HandleRange(1, std::numeric_limits<GLuint>::max()));
 }
 
 HandleAllocator::HandleAllocator(GLuint maximumHandleValue) : mBaseValue(1), mNextValue(1)

src/libANGLE/HandleAllocator_unittest.cpp

diff --git a/src/libANGLE/HandleAllocator_unittest.cpp b/src/libANGLE/HandleAllocator_unittest.cpp
index be067dc..196b346 100644
--- a/src/libANGLE/HandleAllocator_unittest.cpp
+++ b/src/libANGLE/HandleAllocator_unittest.cpp
@@ -90,4 +90,17 @@
     EXPECT_EQ(finalResult, 1);
 }
 
+// The following test covers reserving a handle with max uint value.
+// See http://anglebug.com/1052
+TEST(HandleAllocatorTest, ReserveMaxUintHandle)
+{
+    gl::HandleAllocator allocator;
+
+    GLuint maxUintHandle = std::numeric_limits<GLuint>::max();
+    allocator.reserve(maxUintHandle);
+
+    GLuint normalHandle = allocator.allocate();
+    EXPECT_EQ(1u, normalHandle);
+}
+
 }