Win64: fix return value from lookupAttribute

Issue=190 Author: Makoto Kato git-svn-id: https://angleproject.googlecode.com/svn/trunk@707 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 84d7cbc3
...@@ -19,16 +19,17 @@ Google Inc. ...@@ -19,16 +19,17 @@ Google Inc.
Henry Bridge Henry Bridge
Nat Duca Nat Duca
Vangelis Kokkevis Vangelis Kokkevis
Zhenyao Mo
Alastair Patrick Alastair Patrick
Alok Priyadarshi Alok Priyadarshi
Kenneth Russell Kenneth Russell
Ben Vanik Ben Vanik
Adrienne Walker Adrienne Walker
Zhenyao Mo
Mozilla Corp. Mozilla Corp.
Vladimir Vukicevic
Benoit Jacob Benoit Jacob
Makoto Kato
Vladimir Vukicevic
Apple Inc. Apple Inc.
David Kilzer David Kilzer
......
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 705 #define BUILD_REVISION 707
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -719,7 +719,7 @@ void StaticVertexBuffer::reserveRequiredSpace() ...@@ -719,7 +719,7 @@ void StaticVertexBuffer::reserveRequiredSpace()
mRequiredSpace = 0; mRequiredSpace = 0;
} }
UINT StaticVertexBuffer::lookupAttribute(const VertexAttribute &attribute) std::size_t StaticVertexBuffer::lookupAttribute(const VertexAttribute &attribute)
{ {
for (unsigned int element = 0; element < mCache.size(); element++) for (unsigned int element = 0; element < mCache.size(); element++)
{ {
......
...@@ -93,7 +93,7 @@ class StaticVertexBuffer : public ArrayVertexBuffer ...@@ -93,7 +93,7 @@ class StaticVertexBuffer : public ArrayVertexBuffer
void *map(const VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset); void *map(const VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset);
void reserveRequiredSpace(); void reserveRequiredSpace();
UINT lookupAttribute(const VertexAttribute &attribute); // Returns the offset into the vertex buffer, or -1 if not found std::size_t lookupAttribute(const VertexAttribute &attribute); // Returns the offset into the vertex buffer, or -1 if not found
private: private:
struct VertexElement struct VertexElement
......
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