|
Link Here
|
| 1 |
--- ./gpu/command_buffer/common/gles2_cmd_format.h.orig 2014-08-20 21:02:37.000000000 +0200 |
|
|
| 2 |
+++ ./gpu/command_buffer/common/gles2_cmd_format.h 2014-08-25 23:47:01.000000000 +0200 |
| 3 |
@@ -39,8 +39,8 @@ |
| 4 |
typedef double GLdouble; |
| 5 |
typedef double GLclampd; |
| 6 |
typedef void GLvoid; |
| 7 |
-typedef khronos_intptr_t GLintptr; |
| 8 |
-typedef khronos_ssize_t GLsizeiptr; |
| 9 |
+typedef ptrdiff_t GLintptr; |
| 10 |
+typedef ptrdiff_t GLsizeiptr; |
| 11 |
|
| 12 |
namespace gpu { |
| 13 |
namespace gles2 { |
| 14 |
--- ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc.orig 2014-08-24 12:26:40.000000000 +0200 |
| 15 |
+++ ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc 2014-08-24 12:33:01.000000000 +0200 |
| 16 |
@@ -31,8 +31,8 @@ |
| 17 |
functions->fBindVertexArray = glBindVertexArrayOES; |
| 18 |
functions->fBlendColor = glBlendColor; |
| 19 |
functions->fBlendFunc = glBlendFunc; |
| 20 |
- functions->fBufferData = glBufferData; |
| 21 |
- functions->fBufferSubData = glBufferSubData; |
| 22 |
+ functions->fBufferData = (GrGLBufferDataProc)glBufferData; |
| 23 |
+ functions->fBufferSubData = (GrGLBufferSubDataProc)glBufferSubData; |
| 24 |
functions->fClear = glClear; |
| 25 |
functions->fClearColor = glClearColor; |
| 26 |
functions->fClearStencil = glClearStencil; |
| 27 |
@@ -74,7 +74,7 @@ |
| 28 |
functions->fInsertEventMarker = glInsertEventMarkerEXT; |
| 29 |
functions->fLineWidth = glLineWidth; |
| 30 |
functions->fLinkProgram = glLinkProgram; |
| 31 |
- functions->fMapBufferSubData = glMapBufferSubDataCHROMIUM; |
| 32 |
+ functions->fMapBufferSubData = (GrGLMapBufferSubDataProc)glMapBufferSubDataCHROMIUM; |
| 33 |
functions->fMapTexSubImage2D = glMapTexSubImage2DCHROMIUM; |
| 34 |
functions->fPixelStorei = glPixelStorei; |
| 35 |
functions->fPopGroupMarker = glPopGroupMarkerEXT; |
| 36 |
--- ./ppapi/c/ppb_opengles2.h.orig 2014-08-25 23:42:52.000000000 +0200 |
| 37 |
+++ ./ppapi/c/ppb_opengles2.h 2014-08-25 23:44:21.000000000 +0200 |
| 38 |
@@ -34,8 +34,8 @@ |
| 39 |
typedef long long int GLintptr; |
| 40 |
typedef long long int GLsizeiptr; |
| 41 |
#else |
| 42 |
-typedef long int GLintptr; |
| 43 |
-typedef long int GLsizeiptr; |
| 44 |
+typedef __ptrdiff_t GLintptr; |
| 45 |
+typedef __ptrdiff_t GLsizeiptr; |
| 46 |
#endif // _WIN64 |
| 47 |
#endif // __gl2_h_ |
| 48 |
|
| 49 |
--- ./third_party/khronos/GLES2/gl2.h.orig 2014-08-20 21:03:05.000000000 +0200 |
| 50 |
+++ ./third_party/khronos/GLES2/gl2.h 2014-08-25 23:48:36.000000000 +0200 |
| 51 |
@@ -38,6 +38,7 @@ |
| 52 |
|
| 53 |
#include <GLES2/gl2chromium.h> |
| 54 |
#include <GLES2/gl2platform.h> |
| 55 |
+#include <cstddef> |
| 56 |
|
| 57 |
/* Generated on date 20131202 */ |
| 58 |
|
| 59 |
@@ -67,8 +68,8 @@ |
| 60 |
typedef unsigned int GLuint; |
| 61 |
typedef char GLchar; |
| 62 |
typedef khronos_float_t GLfloat; |
| 63 |
-typedef khronos_ssize_t GLsizeiptr; |
| 64 |
-typedef khronos_intptr_t GLintptr; |
| 65 |
+typedef ptrdiff_t GLintptr; |
| 66 |
+typedef ptrdiff_t GLsizeiptr; |
| 67 |
typedef unsigned int GLbitfield; |
| 68 |
typedef int GLint; |
| 69 |
typedef unsigned char GLboolean; |
| 70 |
--- ./third_party/mesa/src/include/GLES2/gl2.h.orig 2014-08-20 21:03:54.000000000 +0200 |
| 71 |
+++ ./third_party/mesa/src/include/GLES2/gl2.h 2014-08-25 23:50:18.000000000 +0200 |
| 72 |
@@ -4,6 +4,7 @@ |
| 73 |
/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ |
| 74 |
|
| 75 |
#include <GLES2/gl2platform.h> |
| 76 |
+#include <cstddef> |
| 77 |
|
| 78 |
#ifdef __cplusplus |
| 79 |
extern "C" { |
| 80 |
@@ -35,8 +36,8 @@ |
| 81 |
typedef khronos_int32_t GLfixed; |
| 82 |
|
| 83 |
/* GL types for handling large vertex buffer objects */ |
| 84 |
-typedef khronos_intptr_t GLintptr; |
| 85 |
-typedef khronos_ssize_t GLsizeiptr; |
| 86 |
+typedef ptrdiff_t GLintptr; |
| 87 |
+typedef ptrdiff_t GLsizeiptr; |
| 88 |
|
| 89 |
/* OpenGL ES core versions */ |
| 90 |
#define GL_ES_VERSION_2_0 1 |