summaryrefslogtreecommitdiffstats
path: root/src/glut/glx
Commit message (Collapse)AuthorAgeFilesLines
* Makefiles: Don't complain if depend file to be included doesn't exist.Carl Worth2010-07-211-1/+1
| | | | | | | | While bootstrapping the dependencies, make will see the "include depend" directive before the depend file has been created. To avoid a spurious warning in this case we use "-include" instead, (which differs precisely in the fact that it will not emit a diagnostic if the named file does not exist).
* glut: Remove duplicate symbol definition.José Fonseca2010-07-161-2/+0
|
* glut: Include X11 headers and libraries in SCons build.Vinson Lee2010-04-041-0/+1
| | | | Fixes Mac OS X SCons build.
* glut: Add asserts to check for null pointer dereferences.Vinson Lee2010-02-271-0/+2
|
* glut: Silence uninitialized variable warning.Vinson Lee2010-02-141-1/+4
|
* glut: Silence uninitialized variable warning.Vinson Lee2010-02-141-0/+1
|
* scons: Use only the shared object name when linking progs.José Fonseca2010-02-041-0/+2
| | | | Otherwise the whole path gets baked into the executable.
* glut: Remove unnecessary headers.Vinson Lee2010-01-306-6/+0
|
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-081-1/+1
|\ | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c
| * win32_menu: add missing parentheses in mapMenu()Roel Kluin2010-01-061-1/+1
| | | | | | | | | | | | | | `|' has higher precedence than `?'. Signed-off-by: Roel Kluin <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* | Fix glut to work with -fvisibility=hiddenKristian Høgsberg2010-01-0311-2/+20
| | | | | | | | | | | | | | The GLUTAPI #define used in the header file to mark the font structs visible wasn't kicking in because of the #define glutBitmap9By15 XXX prior to #include <GL/glut.h>. High quality code... worked around by copying the GLUTAPI specifier to the invidual C files.
* | scons: Build progs together with everything else.José Fonseca2010-01-011-22/+44
|/ | | | | | | | This is a substantial reorganization, This particular commit enables: - building the progs for unices platforms - glew is now built as a shared library (it is the default, and it is inconvenient and pointless to shift away from that default) - all progs get built by default
* glut: Prevent potential double free in menuVisualSetup.Vinson Lee2009-12-121-0/+5
|
* glut: fix incorrect Vista maximisation size due to WM_GETMINMAXINFO handlingBrian Paul2009-08-111-0/+5
| | | | See bug 23182.
* Use separate $(MINSTALL) for installing librariesDan Nicholson2009-06-011-1/+1
| | | | | | | | | | | | | The special feature of bin/minstall to copy symlinks is only ever needed when installing libraries which may have .so symlinks. All the headers and directories can use a normal install program. These two modes are separated as $(INSTALL) and $(MINSTALL) to allow the user (or autoconf) to override installing normal files as they please. An autoconf check for the install program has been added and will be used in preference to minstall when available. Fixes bug 16053.
* Use variable library name in pkg-config output.Tom Fogal2009-04-292-2/+3
| | | | | | | | | | | Previously the pkg-config output files would contain e.g. `-lGL' and `-lGLU', even if the user modified their configuration to build libraries with different names. This modifies the pkg-config inputs, and corresponding makery, so that modifying the output library name will cause the appropriate updated name to appear in the pkg-config `-l' option. Signed-off-by: Dan Nicholson <[email protected]>
* glut: Use the official WGL functions.José Fonseca2009-02-103-32/+9
| | | | | Especially using wglGetPixelFormat instead of GetPixelFormat causes problems with opengl32.dll and drivers that not hack around this issue.
* glut: DESCRIPTION .def clause deprecated.José Fonseca2009-02-101-6/+0
|
* glut: Minor cleanups.José Fonseca2009-01-263-4/+4
|
* glut: Unlist file.José Fonseca2009-01-081-1/+0
| | | | Again..
* glut: Fix build.José Fonseca2009-01-081-2/+1
|
* glut: List new source file in sconscript.José Fonseca2008-12-301-0/+1
|
* Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-165-0/+94
|\
| * glut: added GLUT_PPM_FILE env var to dump first frame to a PPM fileBrian Paul2008-12-155-0/+94
| | | | | | | | | | Set GLUT_PPM_FILE to the desired filename. The first frame rendered will be written to that file.
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-152-2/+7
|\|
| * Add more package metadata to the pkg-config filesDan Nicholson2008-12-142-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | The pkg-config files have been filled in more thoroughly to allow users to use mesa more effectively. By adding metadata to Requires.private, Libs.private and Cflags, we can ensure that all the libraries and headers will be found in all situations. However, the full substitutions are only done when using the configure script. This also fixes the glu pkg-config file to account for using GL or OSMesa. Fixes bug 18161.
| * Remove CVS keywords.Keith Whitwell2008-09-212-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from gallium-0.1 Conflicts: 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/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/tdfx/tdfx_dd.h
* | glut: MinGW portability fixes.José Fonseca2008-11-215-3/+93
| | | | | | | | Still, it doesn't run as well as the glut binaries...
* | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-181-1/+1
|\| | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
| * glut: s/glut_fbc.c/glut_fcb.c/Shane Blackett2008-09-141-1/+1
| |
* | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-1/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | glut: only call glFinish() in processWindowWorkList() for indirect contexts.Brian Paul2008-09-111-1/+6
| | | | | | | | | | | | Basically, do as the comment says.
* | | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-115-282/+1
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Remove CVS keywords.José Fonseca2008-05-262-2/+0
| |
| * Convert crlf->lf line endings.José Fonseca2008-02-281-103/+103
| | | | | | | | Windows/DOS users should enable core.autocrlf from now on.
| * Remove files of unsupported build systems.José Fonseca2008-02-253-478/+0
| |
| * Rename 'mms-config.' to 'mms.config'.Michal Krol2007-10-291-1/+1
| | | | | | | | | | It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.
| * Gutsy oopses on touch of existing file. Workaround.Keith Whitwell2007-08-071-0/+1
| |
* | Fixed 'make install' for darwinJeremy Huddleston2008-08-121-1/+1
| |
* | Apple: Cleaned up some linking and dylib ids issuesJeremy Huddleston2008-08-111-0/+1
| |
* | 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.
* | Remove generated pkg-config files on `make clean'Dan Nicholson2008-07-111-0/+1
| |
* | Set library and header installation directories from configurationDan Nicholson2008-07-062-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | 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.
* | Add $(X11_INCLUDES) to shut makedepend up.Hasso Tepper2008-04-091-1/+1
| |
* | Convert crlf->lf line endings.José Fonseca2008-02-281-103/+103
| | | | | | | | | | | | Windows/DOS users should enable core.autocrlf from now on: git config --global core.autocrlf true
* | Obsolete, replaced by glut_fcb.c (fortran callbacks)Brian2008-02-251-164/+0
| |
* | add support for LDFLAGS env varDan Nicholson2007-09-281-1/+1
| |
* | Fix timer problem when using Fortran bindings (submitted by Bill Mitchell)Brian2007-09-131-1/+5
| | | | | | | | Also, add some comments about what's going on.
* | added null ptr checkBrian2007-09-131-1/+1
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 18:23:19 +0000