Attachment 146210 Details for Bug 192685 – fix conflicting typedef in GL/glext.h and GLES2/gl2.h

[patch] fix conflicting typedef in GL/glext.h and GLES2/gl2.h

file_192685.txt (text/plain), 2.90 KB, created by Carlos J Puga Medina on 2014-08-24 11:46:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-08-24 11:46:23 UTC

Size: 2.90 KB

patch

obsolete

>--- ./gpu/command_buffer/common/gles2_cmd_format.h.orig	2014-08-20 21:02:37.000000000 +0200
>+++ ./gpu/command_buffer/common/gles2_cmd_format.h	2014-08-24 00:50:27.000000000 +0200
>@@ -39,8 +39,8 @@
> typedef double GLdouble;
> typedef double GLclampd;
> typedef void GLvoid;
>-typedef khronos_intptr_t GLintptr;
>-typedef khronos_ssize_t  GLsizeiptr;
>+typedef ptrdiff_t GLintptr;
>+typedef ptrdiff_t GLsizeiptr;
> 
> namespace gpu {
> namespace gles2 {
>
>--- ./third_party/khronos/GLES2/gl2.h.orig	2014-08-20 21:03:05.000000000 +0200
>+++ ./third_party/khronos/GLES2/gl2.h	2014-08-24 11:39:22.000000000 +0200
>@@ -38,6 +38,7 @@
> 
> #include <GLES2/gl2chromium.h>
> #include <GLES2/gl2platform.h>
>+#include <cstddef>
> 
> /* Generated on date 20131202 */
> 
>@@ -67,8 +68,8 @@
> typedef unsigned int GLuint;
> typedef char GLchar;
> typedef khronos_float_t GLfloat;
>-typedef khronos_ssize_t GLsizeiptr;
>-typedef khronos_intptr_t GLintptr;
>+typedef ptrdiff_t GLsizeiptr;
>+typedef ptrdiff_t GLintptr;
> typedef unsigned int GLbitfield;
> typedef int GLint;
> typedef unsigned char GLboolean;
>
>--- ./third_party/mesa/src/include/GLES2/gl2.h.orig	2014-08-20 21:03:54.000000000 +0200
>+++ ./third_party/mesa/src/include/GLES2/gl2.h	2014-08-24 01:13:41.000000000 +0200
>@@ -4,6 +4,7 @@
> /* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */
> 
> #include <GLES2/gl2platform.h>
>+#include <cstddef>
> 
> #ifdef __cplusplus
> extern "C" {
>@@ -35,8 +36,8 @@
> typedef khronos_int32_t  GLfixed;
> 
> /* GL types for handling large vertex buffer objects */
>-typedef khronos_intptr_t GLintptr;
>-typedef khronos_ssize_t  GLsizeiptr;
>+typedef ptrdiff_t GLintptr;
>+typedef ptrdiff_t GLsizeiptr;
> 
> /* OpenGL ES core versions */
> #define GL_ES_VERSION_2_0                 1
>
>--- ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc.orig	2014-08-24 12:26:40.000000000 +0200
>+++ ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc	2014-08-24 12:33:01.000000000 +0200
>@@ -31,8 +31,8 @@
>   functions->fBindVertexArray = glBindVertexArrayOES;
>   functions->fBlendColor = glBlendColor;
>   functions->fBlendFunc = glBlendFunc;
>-  functions->fBufferData = glBufferData;
>-  functions->fBufferSubData = glBufferSubData;
>+  functions->fBufferData = (GrGLBufferDataProc)glBufferData;
>+  functions->fBufferSubData = (GrGLBufferSubDataProc)glBufferSubData;
>   functions->fClear = glClear;
>   functions->fClearColor = glClearColor;
>   functions->fClearStencil = glClearStencil;
>@@ -74,7 +74,7 @@
>   functions->fInsertEventMarker = glInsertEventMarkerEXT;
>   functions->fLineWidth = glLineWidth;
>   functions->fLinkProgram = glLinkProgram;
>-  functions->fMapBufferSubData = glMapBufferSubDataCHROMIUM;
>+  functions->fMapBufferSubData = (GrGLMapBufferSubDataProc)glMapBufferSubDataCHROMIUM;
>   functions->fMapTexSubImage2D = glMapTexSubImage2DCHROMIUM;
>   functions->fPixelStorei = glPixelStorei;
>   functions->fPopGroupMarker = glPopGroupMarkerEXT;

Actions: View | Diff

Attachments on bug 192685: 145828 | 146210 | 146217 | 146222 | 146224 | 146307