Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 111403003: Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windows (Closed)

Created:
7 years ago by bajones
Modified:
7 years ago
CC:
skia-review_googlegroups.com
Visibility:
Public.

Description

Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windows BUG=326382 Committed: http://code.google.com/p/skia/source/detail?r=12694

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+7 lines, -2 lines) Patch
M include/gpu/gl/GrGLFunctions.h View 1 chunk +7 lines, -2 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
bajones
This change is needed for compatibility in Chrome with incoming updates the the Khronos GL ...
7 years ago (2013-12-16 18:54:57 UTC) #1
bsalomon
lgtm
7 years ago (2013-12-16 18:59:02 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/bajones@chromium.org/111403003/1
7 years ago (2013-12-16 18:59:06 UTC) #3
commit-bot: I haz the power
Change committed as 12694
7 years ago (2013-12-16 19:47:18 UTC) #4
robertphillips
This was reverted in r12707 due to Chromium-side compilation errors (see below). It looks like ...
7 years ago (2013-12-17 15:15:40 UTC) #5
bajones
7 years ago (2013-12-17 15:46:32 UTC) #6
Message was sent while issue was closed. 
On 2013/12/17 15:15:40, robertphillips wrote:
> This was reverted in r12707 due to Chromium-side compilation errors (see
below).
> It looks like you may need to land this and then do a DEPS roll synchronous
with
> a change to update the gl headers in Chromium or maybe put it behind a
> compilation flag.
> 
> FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma\gomacc.exe
> "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\amd64\cl.exe"
> /nologo /showIncludes /FC @obj\ui\gl\gl.gl_bindings_skia_in_process.obj.rsp /c
> ..\..\ui\gl\gl_bindings_skia_in_process.cc
> /Foobj\ui\gl\gl.gl_bindings_skia_in_process.obj /Fdobj\ui\gl\gl.cc.pdb 
>
c:\b\build\slave\cr-win-rel-x64\build\src\ui\gl\gl_bindings_skia_in_process.cc(596)
> : error C2679: binary '=' : no operator found which takes a right-hand operand
> of type 'GLvoid (__cdecl *)(GLenum,GLsizeiptr,const void *,GLenum)' (or there
is
> no acceptable conversion)
>        
>
c:\b\build\slave\cr-win-rel-x64\build\src\third_party\skia\include\gpu\gl\grglinterface.h(117):
> could be 'GrGLInterface::GLPtr<FNPTR_TYPE>
> GrGLInterface::GLPtr<FNPTR_TYPE>::operator =(FNPTR_TYPE)'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferDataProc
>         ]
>        
>
c:\b\build\slave\cr-win-rel-x64\build\src\third_party\skia\include\gpu\gl\grglinterface.h(121):
> or       'GrGLInterface::GLPtr<FNPTR_TYPE>
> &GrGLInterface::GLPtr<FNPTR_TYPE>::operator =(const
> GrGLInterface::GLPtr<FNPTR_TYPE> &)'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferDataProc
>         ]
>         while trying to match the argument list
> '(GrGLInterface::GLPtr<FNPTR_TYPE>, GLvoid (__cdecl *)(GLenum,GLsizeiptr,const
> void *,GLenum))'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferDataProc
>         ]
>
c:\b\build\slave\cr-win-rel-x64\build\src\ui\gl\gl_bindings_skia_in_process.cc(597)
> : error C2679: binary '=' : no operator found which takes a right-hand operand
> of type 'GLvoid (__cdecl *)(GLenum,GLintptr,GLsizeiptr,const void *)' (or
there
> is no acceptable conversion)
>        
>
c:\b\build\slave\cr-win-rel-x64\build\src\third_party\skia\include\gpu\gl\grglinterface.h(117):
> could be 'GrGLInterface::GLPtr<FNPTR_TYPE>
> GrGLInterface::GLPtr<FNPTR_TYPE>::operator =(FNPTR_TYPE)'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferSubDataProc
>         ]
>        
>
c:\b\build\slave\cr-win-rel-x64\build\src\third_party\skia\include\gpu\gl\grglinterface.h(121):
> or       'GrGLInterface::GLPtr<FNPTR_TYPE>
> &GrGLInterface::GLPtr<FNPTR_TYPE>::operator =(const
> GrGLInterface::GLPtr<FNPTR_TYPE> &)'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferSubDataProc
>         ]
>         while trying to match the argument list
> '(GrGLInterface::GLPtr<FNPTR_TYPE>, GLvoid (__cdecl
> *)(GLenum,GLintptr,GLsizeiptr,const void *))'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferSubDataProc
>         ]
> FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma\gomacc.exe
> "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\amd64\cl.exe"
> /nologo /showIncludes /FC
> @obj\gpu\skia_bindings\gpu_skia_bindings.gl_bindings_skia_cmd_buffer.obj.rsp
/c
> ..\..\gpu\skia_bindings\gl_bindings_skia_cmd_buffer.cc
> /Foobj\gpu\skia_bindings\gpu_skia_bindings.gl_bindings_skia_cmd_buffer.obj
> /Fdobj\gpu\skia_bindings\gpu_skia_bindings.cc.pdb 
>
c:\b\build\slave\cr-win-rel-x64\build\src\gpu\skia_bindings\gl_bindings_skia_cmd_buffer.cc(28)
> : error C2679: binary '=' : no operator found which takes a right-hand operand
> of type 'void (__cdecl *)(GLenum,GLsizeiptr,const GLvoid *,GLenum)' (or there
is
> no acceptable conversion)
>        
>
c:\b\build\slave\cr-win-rel-x64\build\src\third_party\skia\include\gpu\gl\grglinterface.h(117):
> could be 'GrGLInterface::GLPtr<FNPTR_TYPE>
> GrGLInterface::GLPtr<FNPTR_TYPE>::operator =(FNPTR_TYPE)'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferDataProc
>         ]
>        
>
c:\b\build\slave\cr-win-rel-x64\build\src\third_party\skia\include\gpu\gl\grglinterface.h(121):
> or       'GrGLInterface::GLPtr<FNPTR_TYPE>
> &GrGLInterface::GLPtr<FNPTR_TYPE>::operator =(const
> GrGLInterface::GLPtr<FNPTR_TYPE> &)'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferDataProc
>         ]
>         while trying to match the argument list
> '(GrGLInterface::GLPtr<FNPTR_TYPE>, void (__cdecl *)(GLenum,GLsizeiptr,const
> GLvoid *,GLenum))'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferDataProc
>         ]
>
c:\b\build\slave\cr-win-rel-x64\build\src\gpu\skia_bindings\gl_bindings_skia_cmd_buffer.cc(29)
> : error C2679: binary '=' : no operator found which takes a right-hand operand
> of type 'void (__cdecl *)(GLenum,GLintptr,GLsizeiptr,const GLvoid *)' (or
there
> is no acceptable conversion)
>        
>
c:\b\build\slave\cr-win-rel-x64\build\src\third_party\skia\include\gpu\gl\grglinterface.h(117):
> could be 'GrGLInterface::GLPtr<FNPTR_TYPE>
> GrGLInterface::GLPtr<FNPTR_TYPE>::operator =(FNPTR_TYPE)'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferSubDataProc
>         ]
>        
>
c:\b\build\slave\cr-win-rel-x64\build\src\third_party\skia\include\gpu\gl\grglinterface.h(121):
> or       'GrGLInterface::GLPtr<FNPTR_TYPE>
> &GrGLInterface::GLPtr<FNPTR_TYPE>::operator =(const
> GrGLInterface::GLPtr<FNPTR_TYPE> &)'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferSubDataProc
>         ]
>         while trying to match the argument list
> '(GrGLInterface::GLPtr<FNPTR_TYPE>, void (__cdecl
> *)(GLenum,GLintptr,GLsizeiptr,const GLvoid *))'
>         with
>         [
>             FNPTR_TYPE=GrGLBufferSubDataProc
>         ]

The Chromium-side patch is https://codereview.chromium.org/99053007/, which I
was hoping would go in yesterday but which Rietveld is making difficult to
review.

Powered by Google App Engine
This is Rietveld 408576698