• Home
  • History
  • Annotate
  • only in /external/mesa3d/include/GLES2/
History log of /external/mesa3d/include/GLES2/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
3ed8d4285360047d78cfd3218ac4f8f325ae5d6e 04-Jul-2012 Kristian Høgsberg <krh@bitplanet.net> GLES2: upgrade gl2ext.h to version 18099

Redo this commit, and remove the inclusion of gl2ext.h
from src/mapi/glapi/glapi_priv.h. The include was added in
8f3be339850ead96f9c6200db4e0db1f74e39d13 to fix a missing prototype for
glDrawBuffersNV and others, but it's not possible to include both
glext.h and gl2ext.h from the same file.

I don't see the missing prototype here (with or without shared glapi)
so I'm just removing the offending #include.

Also, since we're redoing this, update to the most recent gl2ext.2.

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
l2ext.h
567fcd2eb9bf31d5abe9e78677a0c35e4d07e420 04-Jul-2012 Marek Olšák <maraeo@gmail.com> Revert "GLES2: upgrade gl2ext.h to version 16994."

This reverts commit 8818b88748bde6de5a4a98ad237c85151b44c774.

I get a lot of errors like this one:

In file included from ../../../src/mapi/glapi/glapi_priv.h:49:0,
from glapi_dispatch.c:40:
../../../include/GLES2/gl2ext.h:1074:28: error: redefinition of typedef ‘PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC’
../../../include/GL/glext.h:10237:25: note: previous declaration of ‘PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC’ was here

This with a clean build (with git clean -fdX).

I don't get the errors on my other machine. I didn't investigate why,
a wild guess is that this depends on the version of gcc.
l2ext.h
8818b88748bde6de5a4a98ad237c85151b44c774 23-Apr-2012 Gwenole Beauchesne <gwenole.beauchesne@intel.com> GLES2: upgrade gl2ext.h to version 16994.
l2ext.h
b152a239b17c3df3b4cd1090bd70460bde16e5ab 21-Sep-2011 Ian Romanick <ian.d.romanick@intel.com> GLES2/gl2ext: upgrade to gl2ext.h version 15049
l2ext.h
59f8dca7cf7ce2b21d3bfe59c55bd3927de7f39c 31-May-2010 Chia-I Wu <olv@lunarg.com> Update OpenGL ES headers.
l2.h
l2ext.h
l2platform.h
8c092def6c8f59048341c585af9b752bfa1f0236 31-Aug-2008 José Fonseca <jrfonseca@tungstengraphics.com> Remove CVS keywords.

Please remove CVS keywords when importing third-party code into the git
repository.
l2.h
l2ext.h
l2platform.h
e4f3770690129dc1ea683fadbe07f1fbc49cf271 17-Jul-2008 Jonathan White <jwhite@tungstengraphics.com> mesa: WinCE fixes
l2platform.h
f4caddd66f46f69ee34b1790ef1c2f549b186d2f 08-Jul-2008 Jonathan White <jwhite@tungstengraphics.com> egl: updated GL_APIENTRY for Windows
l2platform.h
810888f6564a1421f82190fbb8766ad8c79d88b7 29-Jun-2008 José Fonseca <jrfonseca@tungstengraphics.com> gles: Don't define GLAPIENTRY here.
l2platform.h
b028b0cc533b4e10cdf599e49731e3c30fb0e366 27-Jun-2008 Jonathan White <jwhite@tungstengraphics.com> egl: Windows updates to the platform.h files
l2platform.h
0ebc94d2362222e690d0a72a27858461c5605264 04-Jun-2008 Brian Paul <brian.paul@tungstengraphics.com> egl: added OpenGL ES 2.0 header files in new GLES2 directory
l2.h
l2ext.h
l2platform.h