summaryrefslogtreecommitdiffstats
path: root/src/glx/x11
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-182-1/+10
|\ | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
| * glx: fix 64-bit datatype issueGuillaume Melquiond2008-09-131-1/+7
| |
| * Finish off the previous fix for TFP.Eric Anholt2008-09-121-0/+3
| | | | | | | | | | A couple of those lines of debug printfs I deleted weren't actually debug printfs.
| * dri/swrast: fix swapBuffers after dri2George Sapountzis2008-09-121-0/+6
| |
* | dri/swrast: fix swapBuffers after dri2George Sapountzis2008-09-181-0/+6
| |
* | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-116-104/+174
|\| | | | | | | | | | | | | | | | | | | | | 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
| * DRI2: Drop sarea, implement swap buffers in the X server.Kristian Høgsberg2008-08-296-104/+174
| |
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1124-68/+8
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * fix compilationZack Rusin2008-08-131-1/+1
| |
| * glx: added __glXPreferEGL() to tell libGL to prefer "egl_" drivers over ↵Brian Paul2008-07-112-16/+52
| | | | | | | | | | | | regular DRI drivers. Also, clean-up, consolidate the dlopen() code a bit.
| * revert the DRI2 commitsAlan Hourihane2008-06-1228-4058/+1922
| |
| * add missed files for DRI2 mergeAlan Hourihane2008-06-1110-0/+2732
| |
| * Hook gallium i915 up to DRI2Alan Hourihane2008-06-111-0/+1
| |
| * Bring in DRI2 changesAlan Hourihane2008-06-1119-2269/+1672
| |
| * copy msaa visuals capabilityRoland Scheidegger2008-06-101-1/+4
| |
| * mesa: disable visual warning unless LIBGL_DEBUG is definedBrian Paul2008-06-061-2/+4
| |
| * Remove CVS keywords.José Fonseca2008-05-2621-21/+0
| |
| * Regenerated API dispatch filesBrian Paul2008-05-183-126/+0
| | | | | | | | Follow on to cherry-pick from master
| * Simplify makefile boilerplate code.José Fonseca2008-02-191-3/+3
| | | | | | | | | | Don't define ASM_SOURCES variable globally -- reserve that variable to be defined locally by makefiles, together with C_SOURCES and CPP_SOURCES.
| * Add src/mesa to include path.José Fonseca2007-12-121-0/+1
| |
| * Gutsy oopses on touch of existing file. Workaround.Keith Whitwell2007-08-071-0/+1
| |
* | glx: free driScreen in FreeScreenConfigs()Kristof Ralovich2008-08-201-0/+3
| |
* | glx: free context in driDestroyContext()Kristof Ralovich2008-08-201-0/+1
| |
* | glx: free vertex array state when context is destroyedKristof Ralovich2008-08-203-2/+30
| |
* | fix mem leak (free psc->visuals)Kristof Ralovich2008-08-201-3/+6
| |
* | Fixed 'make install' for darwinJeremy Huddleston2008-08-121-1/+1
| |
* | Apple: Cleaned up some linking and dylib ids issuesJeremy Huddleston2008-08-111-1/+2
| |
* | glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protectionJeremy Huddleston2008-08-085-19/+93
| |
* | glx/x11: Fix missing __GL_EXT_BYTES declarationJeremy Huddleston2008-08-082-1/+3
| |
* | Drop unused 'entries' field from __glxHashTable.Adam Jackson2008-08-041-4/+2
| |
* | glx: Update my e-mail address. :)Ian Romanick2008-07-151-1/+1
| |
* | glx: Trivial clean-ups to __glXSetArrayEnableIan Romanick2008-07-151-4/+8
| |
* | glx/dri: only report DRI2 extensions when DRI2 is enabled.Dave Airlie2008-07-135-6/+6
| | | | | | | | Fixes bug 15477
* | Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson2008-07-121-1/+1
| | | | | | | | | | Respect the user's choice of shell when running mklib rather than always using /bin/sh.
* | glx: add LIBGL_ALWAYS_SOFTWAREGeorge Sapountzis2008-07-071-2/+9
| | | | | | | | | | | | this disables accelerated DRI and fallbacks to client-side software rendering. compile-tested only.
* | glcontextmodes.c is required remove the reference in .gitignoreAlan Hourihane2008-07-041-1/+0
| |
* | Fix builds with compilers other than gcc 3.0 & newerAlan Coopersmith2008-06-213-0/+3
| | | | | | | | | | | | | | Add #include "glheader.h" for definition of __builtin_expect for compilers that don't support it. Signed-off-by: Brian Paul <[email protected]>
* | glx: load swrast_dri.soGeorge Sapountzis2008-06-135-2/+459
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | glx: use ErrorMessageFGeorge Sapountzis2008-06-131-13/+10
| |
* | copy msaa visuals capabilityRoland Scheidegger2008-06-101-1/+4
| |
* | glx: use goto's vs. nested if's ala xserverGeorge Sapountzis2008-06-091-152/+136
| | | | | | | | compile tested only
* | glx: add dri_common.c ala xserverGeorge Sapountzis2008-06-095-517/+504
| | | | | | | | | | | | also drop driFilterModes which is unused in preparation of loading swrast_dri.so
* | Silence warningAlan Hourihane2008-06-051-1/+1
| |
* | replace make with $(MAKE) (bug 16133)Brian Paul2008-05-281-1/+1
| |
* | Revert "glapi: Generate xserver glapi sources in the mesa tree"Kristian Høgsberg2008-05-218-16848/+0
| | | | | | | | | | | | | | | | | | 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
* | Default DRI driver directory to match X.Org xserverDan Nicholson2008-05-091-1/+1
| | | | | | | | | | | | | | 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.
* | Always cleanup the makedepend backup filesDan Nicholson2008-05-061-1/+1
| | | | | | | | | | | | 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.
* | include <X11/Xlib.h>Alan Hourihane2008-04-232-0/+2
| |
* | glx: nitpick renamesGeorge Sapountzis2008-04-234-2/+2
| |
* | glx: split out current context codeGeorge Sapountzis2008-04-237-521/+538
| | | | | | | | also clean header inclusion after code movement
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 21:54:04 +0000