Attachment #146222 for bug #192685

Lines 38-45 Link Here

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

Lines 67-74 Link Here

(-)./third_party/khronos/GLES2/gl2.h (-2 / +2 lines)
67	typedef unsigned int GLuint;	67	typedef unsigned int GLuint;
68	typedef char GLchar;	68	typedef char GLchar;
69	typedef khronos_float_t GLfloat;	69	typedef khronos_float_t GLfloat;
70	typedef khronos_ssize_t GLsizeiptr;	70	typedef __ptrdiff_t GLsizeiptr;
71	typedef khronos_intptr_t GLintptr;	71	typedef __ptrdiff_t GLintptr;
72	typedef unsigned int GLbitfield;	72	typedef unsigned int GLbitfield;
73	typedef int GLint;	73	typedef int GLint;
74	typedef unsigned char GLboolean;	74	typedef unsigned char GLboolean;

Lines 35-42 Link Here

(-)./third_party/mesa/src/include/GLES2/gl2.h (-2 / +2 lines)
35	typedef khronos_int32_t GLfixed;	35	typedef khronos_int32_t GLfixed;
36		36
37	/* GL types for handling large vertex buffer objects */	37	/* GL types for handling large vertex buffer objects */
38	typedef khronos_intptr_t GLintptr;	38	typedef __ptrdiff_t GLintptr;
39	typedef khronos_ssize_t GLsizeiptr;	39	typedef __ptrdiff_t GLsizeiptr;
40		40
41	/* OpenGL ES core versions */	41	/* OpenGL ES core versions */
42	#define GL_ES_VERSION_2_0 1	42	#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;