New issue
Advanced search Search tips
Starred by 21 users
Status: Fixed
Owner: ----
Closed: Mar 2013
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug



Sign in to add a comment
Update khronos GLES2/gl2.h header
Project Member Reported by phajdan.jr@chromium.org, Feb 27 2013 Back to list
Update khronos GLES2/gl2.h header

This will be useful to fix errors like:

In file included from gpu/command_buffer/client/gles2_c_lib.cc:21:0:
gpu/command_buffer/client/../client/gles2_c_lib_autogen.h: In function ‘void GLES2ShaderSource(GLuint, GLsizei, const char**, const GLint*)’:
gpu/command_buffer/client/../client/gles2_c_lib_autogen.h:358:72: error: declaration of C function ‘void GLES2ShaderSource(GLuint, GLsizei, const char**, const GLint*)’ conflicts with
out/Release/obj/gen/khronos_symlinks/GLES2/gl2.h:571:1: error: previous declaration ‘void GLES2ShaderSource(GLuint, GLsizei, const GLchar* const*, const GLint*)’ here
make: *** [out/Release/obj.target/gles2_c_lib/gpu/command_buffer/client/gles2_c_lib.o] Error 1
 
Project Member Comment 1 by bugdroid1@chromium.org, Feb 28 2013
The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=185332

------------------------------------------------------------------------
r185332 | phajdan.jr@chromium.org | 2013-02-28T21:58:26.718820Z

Changed paths:
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation_autogen.h?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/DEPS?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/README.chromium?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_c_lib_autogen.h?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/generate_bindings.py?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/gl_bindings_skia_in_process.cc?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_autogen.h?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/GLES2/gl2.h?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_autogen.h?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/cmd_buffer_functions.txt?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation.cc?r1=185332&r2=185331&pathrev=185332
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_autogen.h?r1=185332&r2=185331&pathrev=185332

Update khronos GLES2/gl2.h header

BUG= 178589 

Review URL: https://codereview.chromium.org/12313140
------------------------------------------------------------------------
Project Member Comment 2 by bugdroid1@chromium.org, Mar 1 2013
The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=185518

------------------------------------------------------------------------
r185518 | tommi@chromium.org | 2013-03-01T10:26:59.741063Z

Changed paths:
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation.cc?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_autogen.h?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation_autogen.h?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/README.chromium?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_c_lib_autogen.h?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/generate_bindings.py?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/gl_bindings_skia_in_process.cc?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_autogen.h?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/GLES2/gl2.h?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_autogen.h?r1=185518&r2=185517&pathrev=185518
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/cmd_buffer_functions.txt?r1=185518&r2=185517&pathrev=185518

Revert 185332
Speculative revert.  All the GPU bots are currently red, failing at the compile stage.
I'm not reverting the skia roll in this change since skia has been rolled again after this change.

> Update khronos GLES2/gl2.h header
> 
> BUG= 178589 
> 
> Review URL: https://codereview.chromium.org/12313140

TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/12383045
------------------------------------------------------------------------
Project Member Comment 3 by bugdroid1@chromium.org, Mar 1 2013
The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=185519

------------------------------------------------------------------------
r185519 | tommi@chromium.org | 2013-03-01T10:39:42.538813Z

Changed paths:
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_autogen.h?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation_autogen.h?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/README.chromium?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_c_lib_autogen.h?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/generate_bindings.py?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/gl_bindings_skia_in_process.cc?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_autogen.h?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/GLES2/gl2.h?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_autogen.h?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/cmd_buffer_functions.txt?r1=185519&r2=185518&pathrev=185519
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation.cc?r1=185519&r2=185518&pathrev=185519

Revert 185518
> Revert 185332
> Speculative revert.  All the GPU bots are currently red, failing at the compile stage.
> I'm not reverting the skia roll in this change since skia has been rolled again after this change.
> 
> > Update khronos GLES2/gl2.h header
> > 
> > BUG= 178589 
> > 
> > Review URL: https://codereview.chromium.org/12313140
> 
> TBR=phajdan.jr@chromium.org
> Review URL: https://codereview.chromium.org/12383045

TBR=tommi@chromium.org
Review URL: https://codereview.chromium.org/12390032
------------------------------------------------------------------------
Project Member Comment 4 by bugdroid1@chromium.org, Mar 1 2013
The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=185521

------------------------------------------------------------------------
r185521 | tommi@chromium.org | 2013-03-01T10:48:50.630088Z

Changed paths:
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_autogen.h?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/GLES2/gl2.h?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_autogen.h?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/cmd_buffer_functions.txt?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation.cc?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_autogen.h?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation_autogen.h?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/DEPS?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/README.chromium?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_c_lib_autogen.h?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/generate_bindings.py?r1=185521&r2=185520&pathrev=185521
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/gl_bindings_skia_in_process.cc?r1=185521&r2=185520&pathrev=185521

Revert 185332
Speculative revert.  All the GPU bots are currently red, failing at the compile stage.
This time also reverting the skia roll even though a more recent version had been rolled.

> Update khronos GLES2/gl2.h header
> 
> BUG= 178589 
> 
> Review URL: https://codereview.chromium.org/12313140

TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/12383047
------------------------------------------------------------------------
Project Member Comment 5 by bugdroid1@chromium.org, Mar 1 2013
The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=185530

------------------------------------------------------------------------
r185530 | tommi@chromium.org | 2013-03-01T11:39:56.865806Z

Changed paths:
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/generate_bindings.py?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/ui/gl/gl_bindings_skia_in_process.cc?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_autogen.h?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/GLES2/gl2.h?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_interface_autogen.h?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/cmd_buffer_functions.txt?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation.cc?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_autogen.h?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_implementation_autogen.h?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/DEPS?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/khronos/README.chromium?r1=185530&r2=185529&pathrev=185530
   M http://src.chromium.org/viewvc/chrome/trunk/src/gpu/command_buffer/client/gles2_c_lib_autogen.h?r1=185530&r2=185529&pathrev=185530

Revert 185521
Relanding the original change and rolling skia back to 7909.

> Revert 185332
> Speculative revert.  All the GPU bots are currently red, failing at the compile stage.
> This time also reverting the skia roll even though a more recent version had been rolled.
> 
> > Update khronos GLES2/gl2.h header
> > 
> > BUG= 178589 
> > 
> > Review URL: https://codereview.chromium.org/12313140
> 
> TBR=phajdan.jr@chromium.org
> Review URL: https://codereview.chromium.org/12383047

TBR=tommi@chromium.org
Review URL: https://codereview.chromium.org/12381037
------------------------------------------------------------------------
Comment 6 by ism...@donmez.ws, Mar 1 2013
This change breaks the compilation on openSUSE 12.3 for me, with r185558 :

[  319s] In file included from ../../gpu/command_buffer/client/gles2_c_lib.cc:21:0:
[  319s] ../../gpu/command_buffer/client/../client/gles2_c_lib_autogen.h: In function 'void GLES2ShaderSource(GLuint, GLsizei, const GLchar* const*, const GLint*)':
[  319s] ../../gpu/command_buffer/client/../client/gles2_c_lib_autogen.h:359:24: error: declaration of C function 'void GLES2ShaderSource(GLuint, GLsizei, const GLchar* const*, const GLint*)' conflicts with
[  319s] In file included from gen/shim_headers/khronos_headers/target/GLES2/gl2.h:6:0,
[  319s]                  from ../../gpu/command_buffer/client/../client/../client/gles2_interface.h:8,
[  319s]                  from ../../gpu/command_buffer/client/../client/gles2_lib.h:10,
[  319s]                  from ../../gpu/command_buffer/client/gles2_c_lib.cc:9:
[  319s] gen/khronos_symlinks/GLES2/gl2.h:572:1: error: previous declaration 'void GLES2ShaderSource(GLuint, GLsizei, const GLchar**, const GLint*)' here
[  319s] In file included from ../../gpu/command_buffer/client/gles2_c_lib.cc:21:0:
[  319s] ../../gpu/command_buffer/client/../client/gles2_c_lib_autogen.h: At global scope:
[  319s] ../../gpu/command_buffer/client/../client/gles2_c_lib_autogen.h:889:21: error: overloaded function with no contextual type information

Status: Fixed
This requires mesa-9.1 to build.
Comment 8 by ism...@donmez.ws, Mar 4 2013
Mesa 9.1 is not a _stable_ release, please reopen this bug.

Comment 9 by ism...@donmez.ws, Mar 4 2013
Just to make sure, Mesa 9.1 is a development release.
Chromium version this applies to is not stable either. If you need to, please apply a local patch reverting above changes. AFAIK openSUSE 12.3 is not released either (9 days to go as of today).

Note that it's non trivial to make everyone happy. There are distros which already have mesa-9.1 in unstable branch (i.e. Gentoo), and given the choice between the two I'd rather support the more recent software (more testing).
Comment 11 by ism...@donmez.ws, Mar 4 2013
You are right, sorry for the noise. Back to internal Mesa for now :)
Project Member Comment 12 by bugdroid1@chromium.org, Mar 10 2013
Labels: -Area-Internals Cr-Internals
Sign in to add a comment