Attachment #146307 for bug #192685

Lines 39-46 Link Here

(-)./gpu/command_buffer/common/gles2_cmd_format.h (-2 / +2 lines)
39	typedef double GLdouble;	39	typedef double GLdouble;
40	typedef double GLclampd;	40	typedef double GLclampd;
41	typedef void GLvoid;	41	typedef void GLvoid;
42	typedef khronos_intptr_t GLintptr;	42	typedef ptrdiff_t GLintptr;
43	typedef khronos_ssize_t GLsizeiptr;	43	typedef ptrdiff_t GLsizeiptr;
44		44
45	namespace gpu {	45	namespace gpu {
46	namespace gles2 {	46	namespace gles2 {

Lines 34-41 Link Here

(-)./ppapi/c/ppb_opengles2.h (-2 / +2 lines)
34	typedef long long int GLintptr;	34	typedef long long int GLintptr;
35	typedef long long int GLsizeiptr;	35	typedef long long int GLsizeiptr;
36	#else	36	#else
37	typedef long int GLintptr;	37	typedef __ptrdiff_t GLintptr;
38	typedef long int GLsizeiptr;	38	typedef __ptrdiff_t GLsizeiptr;
39	#endif // _WIN64	39	#endif // _WIN64
40	#endif // __gl2_h_	40	#endif // __gl2_h_
41		41

Lines 38-43 Link Here

(-)./third_party/khronos/GLES2/gl2.h (-2 / +3 lines)
38		38
39	#include <GLES2/gl2chromium.h>	39	#include <GLES2/gl2chromium.h>
40	#include <GLES2/gl2platform.h>	40	#include <GLES2/gl2platform.h>
		41	#include <cstddef>
41		42
42	/* Generated on date 20131202 */	43	/* Generated on date 20131202 */
43		44
Lines 67-74 Link Here
67	typedef unsigned int GLuint;	68	typedef unsigned int GLuint;
68	typedef char GLchar;	69	typedef char GLchar;
69	typedef khronos_float_t GLfloat;	70	typedef khronos_float_t GLfloat;
70	typedef khronos_ssize_t GLsizeiptr;	71	typedef ptrdiff_t GLintptr;
71	typedef khronos_intptr_t GLintptr;	72	typedef ptrdiff_t GLsizeiptr;
72	typedef unsigned int GLbitfield;	73	typedef unsigned int GLbitfield;
73	typedef int GLint;	74	typedef int GLint;
74	typedef unsigned char GLboolean;	75	typedef unsigned char GLboolean;

Lines 4-9 Link Here

(-)./third_party/mesa/src/include/GLES2/gl2.h (-2 / +3 lines)
4	/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */	4	/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */
5		5
6	#include <GLES2/gl2platform.h>	6	#include <GLES2/gl2platform.h>
		7	#include <cstddef>
7		8
8	#ifdef __cplusplus	9	#ifdef __cplusplus
9	extern "C" {	10	extern "C" {
Lines 35-42 Link Here
35	typedef khronos_int32_t GLfixed;	36	typedef khronos_int32_t GLfixed;
36		37
37	/* GL types for handling large vertex buffer objects */	38	/* GL types for handling large vertex buffer objects */
38	typedef khronos_intptr_t GLintptr;	39	typedef ptrdiff_t GLintptr;
39	typedef khronos_ssize_t GLsizeiptr;	40	typedef ptrdiff_t GLsizeiptr;
40		41
41	/* OpenGL ES core versions */	42	/* OpenGL ES core versions */
42	#define GL_ES_VERSION_2_0 1	43	#define GL_ES_VERSION_2_0 1

Return to bug 192685

Lines 31-38 Link Here

(-)./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc (-3 / +3 lines)
31	functions->fBindVertexArray = glBindVertexArrayOES;	31	functions->fBindVertexArray = glBindVertexArrayOES;
32	functions->fBlendColor = glBlendColor;	32	functions->fBlendColor = glBlendColor;
33	functions->fBlendFunc = glBlendFunc;	33	functions->fBlendFunc = glBlendFunc;
34	functions->fBufferData = glBufferData;	34	functions->fBufferData = (GrGLBufferDataProc)glBufferData;
35	functions->fBufferSubData = glBufferSubData;	35	functions->fBufferSubData = (GrGLBufferSubDataProc)glBufferSubData;
36	functions->fClear = glClear;	36	functions->fClear = glClear;
37	functions->fClearColor = glClearColor;	37	functions->fClearColor = glClearColor;
38	functions->fClearStencil = glClearStencil;	38	functions->fClearStencil = glClearStencil;
Lines 74-80 Link Here
74	functions->fInsertEventMarker = glInsertEventMarkerEXT;	74	functions->fInsertEventMarker = glInsertEventMarkerEXT;
75	functions->fLineWidth = glLineWidth;	75	functions->fLineWidth = glLineWidth;
76	functions->fLinkProgram = glLinkProgram;	76	functions->fLinkProgram = glLinkProgram;
77	functions->fMapBufferSubData = glMapBufferSubDataCHROMIUM;	77	functions->fMapBufferSubData = (GrGLMapBufferSubDataProc)glMapBufferSubDataCHROMIUM;
78	functions->fMapTexSubImage2D = glMapTexSubImage2DCHROMIUM;	78	functions->fMapTexSubImage2D = glMapTexSubImage2DCHROMIUM;
79	functions->fPixelStorei = glPixelStorei;	79	functions->fPixelStorei = glPixelStorei;
80	functions->fPopGroupMarker = glPopGroupMarkerEXT;	80	functions->fPopGroupMarker = glPopGroupMarkerEXT;