Attachment 146217 Details for Bug 192685 – Patch for chromium 36.0.1985.143

[patch] Patch for chromium 36.0.1985.143

patch-chromim-gles2 (text/plain), 2.51 KB, created by oleg.nauman on 2014-08-24 14:48:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oleg.nauman

Created: 2014-08-24 14:48:13 UTC

Size: 2.51 KB

patch

obsolete

>--- ./gpu/command_buffer/common/gles2_cmd_format.h.orig	2014-08-12 22:01:10.000000000 +0300
>+++ ./gpu/command_buffer/common/gles2_cmd_format.h	2014-08-24 17:28:42.000000000 +0300
>@@ -38,8 +38,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-12 22:02:46.000000000 +0300
>+++ ./third_party/khronos/GLES2/gl2.h	2014-08-24 17:30:26.000000000 +0300
>@@ -67,8 +67,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-12 22:04:10.000000000 +0300
>+++ ./third_party/mesa/src/include/GLES2/gl2.h	2014-08-24 17:32:00.000000000 +0300
>@@ -35,8 +35,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-12 22:01:09.000000000 +0300
>+++ ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc	2014-08-24 17:34:47.000000000 +0300
>@@ -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