From 813fefd59901ff07b0e010c98111357a71efaba8 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Thu, 18 Aug 2016 11:26:25 -0700
Subject: [PATCH] reimplement buffer get for (c)end

---
 libraries/gpu/src/gpu/Buffer.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/libraries/gpu/src/gpu/Buffer.h b/libraries/gpu/src/gpu/Buffer.h
index da1a987bee..8160f648fc 100644
--- a/libraries/gpu/src/gpu/Buffer.h
+++ b/libraries/gpu/src/gpu/Buffer.h
@@ -293,10 +293,18 @@ public:
     template <typename T> Iterator<T> end() { return Iterator<T>(&edit<T>(getNum<T>()), _stride); }
 #else 
     template <typename T> Iterator<const T> begin() const { return Iterator<const T>(&get<T>(), _stride); }
-    template <typename T> Iterator<const T> end() const { return Iterator<const T>(&get<T>(getNum<T>()), _stride); }
+    template <typename T> Iterator<const T> end() const {
+        // reimplement get<T> without bounds checking
+        Resource::Size elementOffset = getNum<T>() * _stride + _offset;
+        return Iterator<const T>((reinterpret_cast<const T*> (_buffer->getData() + elementOffset)), _stride);
+    }
 #endif
     template <typename T> Iterator<const T> cbegin() const { return Iterator<const T>(&get<T>(), _stride); }
-    template <typename T> Iterator<const T> cend() const { return Iterator<const T>(&get<T>(getNum<T>()), _stride); }
+    template <typename T> Iterator<const T> cend() const {
+        // reimplement get<T> without bounds checking
+        Resource::Size elementOffset = getNum<T>() * _stride + _offset;
+        return Iterator<const T>((reinterpret_cast<const T*> (_buffer->getData() + elementOffset)), _stride);
+    }
 
     // the number of elements of the specified type fitting in the view size
     template <typename T> Index getNum() const {