summaryrefslogtreecommitdiff
path: root/src/glx/x11
AgeCommit message (Collapse)Author
2008-09-18Merge commit 'origin/master' into gallium-0.2Keith Whitwell
Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
2008-09-18dri/swrast: fix swapBuffers after dri2George Sapountzis
2008-09-13glx: fix 64-bit datatype issueGuillaume Melquiond
2008-09-12Finish off the previous fix for TFP.Eric Anholt
A couple of those lines of debug printfs I deleted weren't actually debug printfs.
2008-09-12dri/swrast: fix swapBuffers after dri2George Sapountzis
2008-09-11Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane
gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell
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-29DRI2: Drop sarea, implement swap buffers in the X server.Kristian Høgsberg
2008-08-20glx: free driScreen in FreeScreenConfigs()Kristof Ralovich
2008-08-20glx: free context in driDestroyContext()Kristof Ralovich
2008-08-20glx: free vertex array state when context is destroyedKristof Ralovich
2008-08-20fix mem leak (free psc->visuals)Kristof Ralovich
2008-08-13fix compilationZack Rusin
2008-08-12Fixed 'make install' for darwinJeremy Huddleston
2008-08-11Apple: Cleaned up some linking and dylib ids issuesJeremy Huddleston
2008-08-08glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protectionJeremy Huddleston
2008-08-08glx/x11: Fix missing __GL_EXT_BYTES declarationJeremy Huddleston
2008-08-04Drop unused 'entries' field from __glxHashTable.Adam Jackson
2008-07-15glx: Update my e-mail address. :)Ian Romanick
2008-07-15glx: Trivial clean-ups to __glXSetArrayEnableIan Romanick
2008-07-13glx/dri: only report DRI2 extensions when DRI2 is enabled.Dave Airlie
Fixes bug 15477
2008-07-12Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson
Respect the user's choice of shell when running mklib rather than always using /bin/sh.
2008-07-11glx: added __glXPreferEGL() to tell libGL to prefer "egl_" drivers over ↵Brian Paul
regular DRI drivers. Also, clean-up, consolidate the dlopen() code a bit.
2008-07-07glx: add LIBGL_ALWAYS_SOFTWAREGeorge Sapountzis
this disables accelerated DRI and fallbacks to client-side software rendering. compile-tested only.
2008-07-04glcontextmodes.c is required remove the reference in .gitignoreAlan Hourihane
2008-06-21Fix builds with compilers other than gcc 3.0 & newerAlan Coopersmith
Add #include "glheader.h" for definition of __builtin_expect for compilers that don't support it. Signed-off-by: Brian Paul <brian.paul@tungstengraphics.com>
2008-06-13glx: load swrast_dri.soGeorge Sapountzis
caveats: - does not work with old (i.e. libGLcore) xserver: - made unbindContext a noop - extensions: GLX_SGI_make_current_read GLX_EXT_texture_from_pixmap GLX_MESA_copy_sub_buffer
2008-06-13glx: use ErrorMessageFGeorge Sapountzis
2008-06-12revert the DRI2 commitsAlan Hourihane
2008-06-11add missed files for DRI2 mergeAlan Hourihane
2008-06-11Hook gallium i915 up to DRI2Alan Hourihane
2008-06-11Bring in DRI2 changesAlan Hourihane
2008-06-10copy msaa visuals capabilityRoland Scheidegger
2008-06-10copy msaa visuals capabilityRoland Scheidegger
2008-06-09glx: use goto's vs. nested if's ala xserverGeorge Sapountzis
compile tested only
2008-06-09glx: add dri_common.c ala xserverGeorge Sapountzis
also drop driFilterModes which is unused in preparation of loading swrast_dri.so
2008-06-06mesa: disable visual warning unless LIBGL_DEBUG is definedBrian Paul
2008-06-05Silence warningAlan Hourihane
2008-05-28replace make with $(MAKE) (bug 16133)Brian Paul
2008-05-26Remove CVS keywords.José Fonseca
2008-05-21Revert "glapi: Generate xserver glapi sources in the mesa tree"Kristian Høgsberg
This reverts commit 7688791fc52f116eea421fda1d17aba5cf10977b, and takes us back to generating the glapi files straight into the xserver tree. Conflicts: src/glx/x11/indirect_size_get.c
2008-05-18Regenerated API dispatch filesBrian Paul
Follow on to cherry-pick from master
2008-05-09Default DRI driver directory to match X.Org xserverDan Nicholson
Since the only valid consumer of the DRI drivers is the X.Org xserver, this changes the default DRI driver directory to match xorg-server: ${libdir}/dri. The old default of /usr/X11R6/modules/dri was wrong for nearly all current systems.
2008-05-06Always cleanup the makedepend backup filesDan Nicholson
Consistently cleanup the depend.bak files created by makedepend. Also, realclean has been changed to use a single find command, which speeds it up considerably.
2008-04-23include <X11/Xlib.h>Alan Hourihane
2008-04-23glx: nitpick renamesGeorge Sapountzis
2008-04-23glx: split out current context codeGeorge Sapountzis
also clean header inclusion after code movement
2008-04-10Get the default GLXPixmap texture target from the server when appropriate.Michel Dänzer
Fixes compiz with direct rendering when both GLX_TEXTURE_2D_EXT and GLX_TEXTURE_RECTANGLE_EXT are supported for a GLXPixmap and the application didn't specify the texture target as a GLX drawable attribute when creating the GLX drawable.
2008-04-08Handle fbconfig comparison correctly for attributes the X server didn't send.Jie Luo
2008-04-08Only convert configs if screen creation was successful.Kristian Høgsberg
Thanks to Adam Jackson for pointing it out.