Skip to content

A
angle
Commit d64a53fe by apatrick@chromium.org
Options

Fix a 64-bit error in ProgramBinary::load

ProgramBinary::save writes a size_t, so ProgramBinary::load needs to read it as the same type. Landed for jschuh. Original review: https://codereview.appspot.com/7304057/ Review URL: https://codereview.appspot.com/7310052 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1825 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 70a76298
Showing with 2 additions and 2 deletions
src/common/version.h
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1824 #define BUILD_REVISION 1825
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
src/libGLESv2/ProgramBinary.cpp
...@@ -1687,7 +1687,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) ...@@ -1687,7 +1687,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length)
stream.read(&mUsedPixelSamplerRange); stream.read(&mUsedPixelSamplerRange);
stream.read(&mUsesPointSize); stream.read(&mUsesPointSize);
unsigned int size; size_t size;
stream.read(&size); stream.read(&size);
if (stream.error()) if (stream.error())
{ {
......
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