summaryrefslogtreecommitdiff
path: root/src/glut/glx
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-14glut: s/glut_fbc.c/glut_fcb.c/Shane Blackett
2008-09-11Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c
2008-09-11glut: only call glFinish() in processWindowWorkList() for indirect contexts.Brian Paul
Basically, do as the comment says.
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-12Fixed 'make install' for darwinJeremy Huddleston
2008-08-11Apple: Cleaned up some linking and dylib ids issuesJeremy Huddleston
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-11Remove generated pkg-config files on `make clean'Dan Nicholson
2008-07-06Set library and header installation directories from configurationDan Nicholson
Currently the installation directories for libraries and headers are resolved within the install commands. For instance, the libraries will be installed to $(INSTALL_DIR)/$(LIB_DIR). This limits the flexibility of the installation, such as when the libraries should be installed to a subdirectory like /usr/lib/tls. This adds the make variables $(INSTALL_LIB_DIR) and $(INSTALL_INC_DIR) to define the locations that the libraries and headers are installed. For the static configs, this resolves exactly as before to $(INSTALL_DIR)/include and $(INSTALL_DIR)/$(LIB_DIR). For autoconf, they are derived directly from the --libdir and --includedir settings.
2008-05-26Remove CVS keywords.José Fonseca
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-09Add $(X11_INCLUDES) to shut makedepend up.Hasso Tepper
2008-02-28Convert crlf->lf line endings.José Fonseca
Windows/DOS users should enable core.autocrlf from now on: git config --global core.autocrlf true
2008-02-28Convert crlf->lf line endings.José Fonseca
Windows/DOS users should enable core.autocrlf from now on.
2008-02-25Obsolete, replaced by glut_fcb.c (fortran callbacks)Brian
2008-02-25Remove files of unsupported build systems.José Fonseca
2007-10-29Rename 'mms-config.' to 'mms.config'.Michal Krol
It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.
2007-09-28add support for LDFLAGS env varDan Nicholson
2007-09-13Fix timer problem when using Fortran bindings (submitted by Bill Mitchell)Brian
Also, add some comments about what's going on.
2007-09-13added null ptr checkBrian
2007-09-12Add glut_fcb.c to the build and update to fix warnings (see bug 12405)Brian
2007-09-12Rename. "fcb" = fortran call backBrian
2007-09-12pkg-config supportDan Nicholson
2007-09-12DESTDIR support.Dan Nicholson
2007-08-07Gutsy oopses on touch of existing file. Workaround.Keith Whitwell
2007-08-01fix mem leak (bug 11791)Brian
2007-07-31fix some FreeBSD issuesBrian
2007-07-27more Mingw32 fixesZhang
2007-07-21Fix a number of MINGW32 issuesZhang
2007-06-28a variety of fixes for MingWzhang
2007-04-24assorted fixes for Windows/VC8Karl Schultz
2006-10-19New bin/minstall script - a minimal replacement for 'install'.Brian Paul
Correctly handles symlinks so we can get rid of the COPY_LIBS stuff.
2006-09-27remove obsolete commentBrian Paul
2006-09-21GLUT_FORCE_VISUAL env var to force glut to use a particular visual (debug only)Brian Paul
2006-09-21new code to init DirectColor colormapsBrian Paul
2006-07-13LIB_DIR is now just 'lib' or 'lib64'Brian Paul
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck.
2006-06-26Use $(LIB_DIR) instead of $(TOP)/lib since libraries sometimes go into lib64/.Brian Paul
Probably need to fix the install destinations too...
2006-06-22New 'install' targets in makefile. See bug 2372.Brian Paul
2006-05-10move check for event.xbutton.button <= GLUT_MAX_MENUS (see sf bug 1484284)Brian Paul
2006-05-10check if button >= GLUT_MAX_MENUS in glutAttacheMenu()Brian Paul
2006-05-09check event button against GLUT_MAX_MENUS (bug 1484284)Brian Paul
2006-01-02Use X11_INCLUDES config macro instead ofJerome Glisse
hardcoded path in makefile.
2005-09-23 Committing in .Jouk Jansen
1) change compilation on VMS to use IEEE floating points 2) one more problem with _mesa_sprintf solved Modified Files: Mesa/docs/README.VMS Mesa/progs/demos/descrip.mms Mesa/progs/tests/descrip.mms Mesa/progs/util/descrip.mms Mesa/progs/xdemos/descrip.mms Mesa/src/glu/mesa/descrip.mms Mesa/src/glu/sgi/descrip.mms Mesa/src/glut/glx/descrip.mms Mesa/src/mesa/array_cache/descrip.mms Mesa/src/mesa/drivers/common/descrip.mms Mesa/src/mesa/drivers/osmesa/descrip.mms Mesa/src/mesa/drivers/x11/descrip.mms Mesa/src/mesa/glapi/descrip.mms Mesa/src/mesa/main/descrip.mms Mesa/src/mesa/main/texobj.c Mesa/src/mesa/math/descrip.mms Mesa/src/mesa/shader/descrip.mms Mesa/src/mesa/shader/grammar/descrip.mms Mesa/src/mesa/shader/slang/descrip.mms Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/swrast_setup/descrip.mms Mesa/src/mesa/tnl/descrip.mms ----------------------------------------------------------------------
2005-09-02fix some strict aliasing problems related to choosing framebuffer configs ↵Brian Paul
(Matthias Hopf)
2005-07-26Quote $(CC) and $(CXX) so that 'CC=ccache gcc' and 'CXX=ccache g++' willIan Romanick
work again.
2005-07-25Added -linker option to mklib, used to specify a particular program forBrian Paul
linking, if relevant. Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
2005-05-24moved to windows build dirKarl Schultz
2005-05-07assorted warning clean-ups for x86_64, etc (Mikko T.)Brian Paul
2005-01-19Remove depend on make cleanKeith Whitwell