summaryrefslogtreecommitdiff
path: root/include/GLES
AgeCommit message (Collapse)AuthorFilesLines
2008-09-21Merge branch 'master' into gallium-0.2Keith Whitwell1-0/+45
Conflicts: include/GLES/egl.h include/GLES/egltypes.h src/egl/main/eglconfig.c src/egl/main/eglconfig.h src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libutil/error.c src/glu/sgi/libutil/glue.c src/glu/sgi/libutil/gluint.h src/glu/sgi/libutil/project.c src/glu/sgi/libutil/registry.c src/glx/x11/Makefile src/glx/x11/glxclient.h src/glx/x11/glxext.c src/mesa/drivers/dri/ffb/ffb_dd.h src/mesa/drivers/dri/ffb/ffb_points.h src/mesa/drivers/dri/gamma/gamma_context.h src/mesa/drivers/dri/gamma/gamma_macros.h src/mesa/drivers/dri/i810/i810context.h src/mesa/drivers/dri/r128/r128_dd.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/tdfx/tdfx_dd.h src/mesa/drivers/x11/xm_buffer.c src/mesa/glapi/glapi.c src/mesa/main/dispatch.c src/mesa/main/state.c src/mesa/main/texstate.c src/mesa/shader/arbprogparse.c src/mesa/shader/arbprogram.c src/mesa/shader/nvfragparse.c src/mesa/shader/nvprogram.c src/mesa/shader/shader_api.c src/mesa/sources src/mesa/swrast/s_aaline.c src/mesa/swrast/s_aaline.h src/mesa/swrast/s_aatriangle.h src/mesa/swrast/s_accum.c src/mesa/swrast/s_alpha.h src/mesa/swrast/s_bitmap.c src/mesa/swrast/s_blend.h src/mesa/swrast/s_context.c src/mesa/swrast/s_copypix.c src/mesa/swrast/s_depth.c src/mesa/swrast/s_depth.h src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_drawpix.h src/mesa/swrast/s_feedback.c src/mesa/swrast/s_feedback.h src/mesa/swrast/s_fog.h src/mesa/swrast/s_lines.h src/mesa/swrast/s_logic.h src/mesa/swrast/s_masking.h src/mesa/swrast/s_points.c src/mesa/swrast/s_points.h src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast/s_span.h src/mesa/swrast/s_stencil.h src/mesa/swrast/s_texcombine.c src/mesa/swrast/s_texcombine.h src/mesa/swrast/s_texfilter.c src/mesa/swrast/s_texfilter.h src/mesa/swrast/s_texstore.c src/mesa/swrast/s_triangle.c src/mesa/swrast/s_triangle.h src/mesa/swrast/s_zoom.h src/mesa/swrast_setup/ss_context.c src/mesa/swrast_setup/ss_triangle.h src/mesa/tnl/t_draw.c src/mesa/tnl/t_vb_light.c src/mesa/tnl/t_vertex_generic.c src/mesa/tnl/t_vertex_sse.c src/mesa/tnl/t_vp_build.h src/mesa/tnl/tnl.h src/mesa/x86/common_x86.c
2008-09-21mesa: standardize on C99's uint*_t instead of u_int*_tKeith Whitwell1-7/+7
2008-09-19Update to SGI FreeB 2.0.Adam Jackson1-32/+28
Under the terms of version 1.1, "once Covered Code has been published under a particular version of the License, Recipient may, for the duration of the License, continue to use it under the terms of that version, or choose to use such Covered Code under the terms of any subsequent version published by SGI." FreeB 2.0 license refers to "dates of first publication". They are here taken to be 1991-2000, as noted in the original license text: ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. Official FreeB 2.0 text: http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf As always, this code has not been tested for conformance with the OpenGL specification. OpenGL conformance testing is available from http://khronos.org/ and is required for use of the OpenGL logo in product advertising and promotion.
2008-08-31Remove CVS keywords.José Fonseca3-3/+0
Please remove CVS keywords when importing third-party code into the git repository.
2008-07-16mesa: WinCE fixesJonathan White1-1/+5
2008-07-07egl: updated GL_APIENTRY for WindowsJonathan White1-1/+2
2008-06-30gles: Don't define GLAPIENTRY here.José Fonseca1-1/+0
2008-06-27egl: Windows updates to the platform.h filesJonathan White1-2/+1
2008-06-05egl: assorted fixes for WindowsJonathan White1-2/+0
Note that int32_t is typedef'd both in p_compiler.h and eglplatform.h
2008-06-04egl: new GLES/glplatform.h headerBrian Paul1-0/+76
2008-06-04egl: updated GLES/gl.h and GLES/glext.h headers from Khronos.orgBrian Paul2-356/+821
2008-06-04egl: created GLES/egl.h backward-compatibility header (see comments inside)Brian Paul1-0/+6
2008-06-04egl: moved egl.h into EGL/ directoryBrian Paul1-300/+0
2008-06-04egl: moved eglext.h into EGL/ directoryBrian Paul1-186/+0
2008-05-27obsolete with EGL 1.4Brian Paul1-100/+0
2008-05-27added EGL_MESA_screen_surface, EGL_MESA_copy_context extensionsBrian Paul1-0/+59
2008-05-27remove stray ! characterBrian Paul1-1/+1
2008-05-27new eglext.h from KhronosBrian Paul1-0/+127
2008-05-27EGL 1.4 header from KhronosBrian Paul1-244/+279
2008-05-07mesa: update/add newer GL ES headersBrian Paul4-155/+1092
2006-02-05EGL 1.2 tokens/functions/etc.Brian Paul1-2/+50
2005-12-10rename eglShowSurfaceMESA, add EGL_SCREEN_POSITION_GRANULARITY_MESABrian Paul1-9/+11
2005-05-17remove eglQueryDisplayMESA()Brian Paul1-1/+0
2005-05-16EGL_MESA_copy_context stuffBrian Paul1-3/+4
2005-05-14Add empty placeholder for eglCopyContextMESAJon Smirl1-0/+1
2005-05-14Fix compiler warning about missing parameter listJon Smirl1-1/+1
2005-05-13First attempt at getting egl support up on dumb framebuffer.Jon Smirl1-1/+3
Seems to be mostly working. Not all of egl API is implemented.
2005-05-04EGLScreenMESA updatesBrian Paul2-8/+8
2005-04-22types for Mesa implementation of EGLBrian Paul1-39/+35
2005-04-22prototype EGL_MESA_screen_surface.Brian Paul1-0/+40
2005-03-04Add preliminary EGL headers.Adam Jackson2-0/+280