summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell14-373/+3190
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
2008-08-11version 20 of glxext.hBrian Paul1-2/+34
2008-08-11version 41 of glext.hBrian Paul1-4/+393
2008-08-11version 41 of glext.hBrian Paul1-2/+380
2008-08-11version 20 of glxext.hBrian Paul1-2/+34
2008-08-08Apple: Some changes to fix compilation problems on OSXJeremy Huddleston1-0/+7
2008-08-06egl: define vsnprintfJonathan White1-0/+1
2008-08-05egl: added snprintf, strcasecmp definesJonathan White1-0/+3
2008-08-05egl: typedef uint8_t for WindowsJonathan White1-0/+2
2008-08-04egl: typedef u_int32_t for WindowsJonathan White1-0/+1
2008-07-16mesa: WinCE fixesJonathan White3-3/+11
2008-07-15additional preprocessor checks for stdint.h, inttypes.h, etcBlair Sadewitz2-7/+7
The patches to glext.h and glxext.h have been sent to Khronos/bugzilla.
2008-07-15additional preprocessor checks for stdint.h, inttypes.h, etcBlair Sadewitz2-7/+7
The patches to glext.h and glxext.h have been sent to Khronos/bugzilla.
2008-07-07egl: updated GL_APIENTRY for WindowsJonathan White2-2/+4
2008-06-30gles: Don't define GLAPIENTRY here.José Fonseca2-2/+0
2008-06-28egl: WinCE doesn't have sys/types.hJosé Fonseca1-1/+3
2008-06-27egl: Windows updates to the platform.h filesJonathan White2-15/+11
2008-06-24mesa: WGL is not part of the WinCE API.José Fonseca1-2/+3
Although it would be interesting having the GDI winsys running on WinCE several Windows GDI API functions and data structures are missing from WinCE headers, making this far from a trivial endeavor.
2008-06-24mesa: Don't include sys/types.h on WinCE.José Fonseca1-0/+2
We probably shouldn't be including sys/types.h at all, but let's leave that for another time.
2008-06-12revert the DRI2 commitsAlan Hourihane3-588/+341
2008-06-11add missed files for DRI2 mergeAlan Hourihane1-0/+134
2008-06-11Bring in DRI2 changesAlan Hourihane2-341/+454
2008-06-06egl: updated EGLAPI for WindowsJonathan White1-3/+7
2008-06-05egl: assorted fixes for WindowsJonathan White2-4/+18
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: added OpenGL ES 2.0 header files in new GLES2 directoryBrian Paul3-0/+1114
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-0/+0
2008-06-04egl: moved eglext.h into EGL/ directoryBrian Paul1-0/+0
2008-06-04remove old/unused foomesa.h example headerBrian Paul1-76/+0
2008-05-29Assorted Windows fixes (Karl Schultz)Brian Paul1-1/+1
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-27added typedefs for X/MesaBrian Paul1-0/+7
2008-05-27remove stray ! characterBrian Paul1-1/+1
2008-05-27new eglplatform.h from Khronos.org (replaces GLES/egltypes.h)Brian Paul1-0/+55
2008-05-27new eglext.h from KhronosBrian Paul1-0/+127
2008-05-27EGL 1.4 header from KhronosBrian Paul1-244/+279
2008-05-26Remove CVS keywords.José Fonseca1-2/+0
2008-05-23drop GLcoreGeorge Sapountzis1-73/+0
2008-05-20Add DRI driver that uses the mesa swrast module.George Sapountzis1-0/+57
2008-05-07mesa: update/add newer GL ES headersBrian Paul4-155/+1092
2008-04-23glcore: build from mesaGeorge Sapountzis1-0/+73
2008-03-31DRI interface changes and DRI2 direct rendering support.Kristian Høgsberg2-205/+215
Add DRI2 direct rendering support to libGL and add DRI2 client side protocol code. Extend the GLX 1.3 create drawable functions in glx_pbuffer.c to call into the DRI driver when possible. Introduce __DRIconfig, opaque struct that represents a DRI driver configuration. Get's rid of the open coded __GLcontextModes in the DRI driver interface and the context modes create and destroy functions that the loader was requires to provide. glcore.h is no longer part of the DRI driver interface. The DRI config is GL binding agnostic, that is, not specific to GLX, EGL or other bindings. The core API is now also an extension, and the driver exports a list of extensions as the symbol __driDriverExtensions, which the loader must dlsym() for. The list of extension will always include the DRI core extension, which allows creating and manipulating DRI screens, drawables and contexts. The DRI legacy extension, when available, provides alternative entry points for creating the DRI objects that work with the XF86DRI infrastructure. Change DRI2 client code to not use drm drawables or contexts. We never used drm_drawable_t's and the only use for drm_context_t was as a unique identifier when taking the lock. We now just allocate a unique lock ID out of the DRILock sarea block. Once we get rid of the lock entirely, we can drop this hack. Change the interface between dri_util.c and the drivers, so that the drivers now export the DriverAPI struct as driDriverAPI instead of the InitScreen entry point. This lets us avoid dlsym()'ing for the DRI2 init screen function to see if DRI2 is supported by the driver.
2008-03-25updated to version 40Brian1-3/+14
2008-03-24fix wrong values for GL_READ/DRAW_FRAMEBUFFER_BINDING_EXT tokensBrian1-2/+2
2008-03-09DRI2: Make setTexBuffer take a __DRIdrawable instead of a BO handle.Kristian Høgsberg1-7/+5
This fixes a problem where texturing from the same Pixmap more than once per batchbuffer would hang the DRI driver. We just use the region associated with the front left renderbuffer of the __DRIdrawable for texturing, which avoids creating different regions for the same BO. This change also make GLX_EXT_texture_from_pixmap work for direct rendering, since tracking the __DRIdrawable -> BO handle now uses the standard DRI2 event buffer. Of course, DRI2 direct rendering doesn't exist yet. Finally, this commit bumps the DRI interface version again, accounting for the change in the DRI_TEX_BUFFER extension and the change in commit 0bba0e5be7a4a7275dad1edc34bdcc134ea1f424 to pass in the event buffer head index on drawable creation.
2008-03-09DRI2: Add event buffer head as an argument to driCreateNewDrawable().Kristian Høgsberg1-0/+1
The DRI driver needs to know where in the buffer to start reading.
2008-03-03[dri2] Add tail pointer to reemitDrawableInfo callback.Kristian Høgsberg1-1/+2
When the DRI doesn't parse the event buffer for a while, the X server may overwrite data that the driver didn't get a chance to look at. The reemitDrawableInfo callback requests that the X server reemit all info for the specified drawable. To make use of this, the drive needs to know the new tail pointer so it know where to start reading from.