Keith Whitwell
89ab66448e
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/trivial/Makefile
src/mesa/glapi/glthread.c
2008-09-18 19:03:02 +01:00
Shane Blackett
641b80275b
glut: s/glut_fbc.c/glut_fcb.c/
2008-09-14 17:51:01 -06:00
Keith Whitwell
cc7dd4fc1b
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
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-11 18:32:05 +01:00
Brian Paul
d50d68a1c9
glut: only call glFinish() in processWindowWorkList() for indirect contexts.
...
Basically, do as the comment says.
2008-09-11 11:05:13 -06:00
Keith Whitwell
0397b2bb41
Merge branch 'gallium-0.1' into gallium-0.2
...
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-09-11 16:05:15 +01:00
Jeremy Huddleston
98e7c1cf38
Fixed 'make install' for darwin
2008-08-12 10:59:40 -07:00
José Fonseca
ebb5855821
glut: Remove EOF characters.
2008-08-12 13:00:10 +01:00
Jeremy Huddleston
ac0d19601c
Apple: Cleaned up some linking and dylib ids issues
2008-08-11 09:17:06 -07:00
Dan Nicholson
3b8081603b
Always pass -linker and -ldflags to mklib for shared libraries
...
This just makes the use of mklib more consistent throughout Mesa where
we always want to pass the linker and LDFLAGS when we might be making a
shared library.
2008-07-12 10:25:40 -07:00
Dan Nicholson
db072baaaf
Call mklib with $(SHELL) so the user controls the interpreter
...
Respect the user's choice of shell when running mklib rather than always
using /bin/sh.
2008-07-12 10:25:40 -07:00
Dan Nicholson
6c44c6d020
Remove generated pkg-config files on `make clean'
2008-07-11 10:43:29 -07:00
Dan Nicholson
11ac5b2456
Set library and header installation directories from configuration
...
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-07-06 14:15:40 -07:00
Jose Fonseca
3c207936be
Fix CRLF line endings.
2008-06-07 12:40:39 +09:00
Jose Fonseca
ae18cbcfc5
Fix CRLF line endings.
2008-06-07 12:34:45 +09:00
José Fonseca
77ce568ff7
Remove CVS keywords.
2008-05-26 20:14:40 +09:00
Dan Nicholson
c5e2b850ad
Always cleanup the makedepend backup files
...
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-05-06 14:00:43 -07:00
Hasso Tepper
43887cf396
Add $(X11_INCLUDES) to shut makedepend up.
2008-04-09 10:56:12 -07:00
José Fonseca
60159c1b09
Convert crlf->lf line endings.
...
Windows/DOS users should enable core.autocrlf from now on:
git config --global core.autocrlf true
2008-02-28 16:34:32 +09:00
José Fonseca
2573f0e5d6
Convert crlf->lf line endings.
...
Windows/DOS users should enable core.autocrlf from now on.
2008-02-28 15:53:13 +09:00
Brian
93d1ecdbd6
Obsolete, replaced by glut_fcb.c (fortran callbacks)
2008-02-25 11:01:23 -07:00
José Fonseca
2d38d1b300
Remove files of unsupported build systems.
2008-02-25 17:11:28 +09:00
Claudio Ciccani
c231f8ff35
[glut-directfb] Fixed displaying of single buffered window.
2008-02-08 12:35:08 +01:00
Claudio Ciccani
5edede94bb
[glut-directfb] When converting microseconds to milliseconds, round to the next integer.
2008-02-08 12:03:53 +01:00
Brian
4875b40304
Assorted patches for miniglx/linux-solo (Gavin Li <codeview@gmail.com>)
2008-01-23 16:03:19 -07:00
Michal Krol
918ea5168b
Rename 'mms-config.' to 'mms.config'.
...
It looks like Windows does not like filenames ending with a dot,
in effect renaming it to 'mms-config'.
2007-10-29 19:50:10 +00:00
Dan Nicholson
2a3e33865d
add support for LDFLAGS env var
2007-09-28 18:42:21 -06:00
Brian
885a95f4fa
Fix timer problem when using Fortran bindings (submitted by Bill Mitchell)
...
Also, add some comments about what's going on.
2007-09-13 14:42:23 -06:00
Brian
20b331c2f6
added null ptr check
2007-09-13 09:26:27 -06:00
Brian
ae0dd620fe
Add glut_fcb.c to the build and update to fix warnings (see bug 12405)
2007-09-12 13:40:15 -06:00
Brian
642267b2d8
Rename. "fcb" = fortran call back
2007-09-12 13:37:10 -06:00
Dan Nicholson
94617bc6d5
pkg-config support
2007-09-12 10:03:05 -06:00
Dan Nicholson
f5557c3a52
DESTDIR support.
2007-09-12 09:57:53 -06:00
Keith Whitwell
90ee7a4144
Gutsy oopses on touch of existing file. Workaround.
2007-08-07 10:18:30 +01:00
Brian
e9fbf69aea
fix mem leak (bug 11791)
2007-08-01 08:43:58 -06:00
Brian
6fae66715b
fix some FreeBSD issues
2007-07-31 14:57:37 -06:00
Zhang
35f35294cd
more Mingw32 fixes
2007-07-27 11:19:35 -06:00
Zhang
76fb808910
Fix a number of MINGW32 issues
2007-07-21 11:28:06 -06:00
Claudio Ciccani
a49570794a
Compute the amount of time to sleep on idle event using timers as reference.
2007-07-01 12:24:44 +02:00
zhang
37aca21129
a variety of fixes for MingW
2007-06-28 08:12:52 -06:00
Dave Airlie
401629c721
miniglx/glut: should use the x/y pos to create window
...
This allows moving miniglx glut windows around the framebuffer
2007-05-08 10:49:31 +10:00
Karl Schultz
286faac68e
assorted fixes for Windows/VC8
2007-04-24 08:53:28 -06:00
Sean D'Epagnier
7ae8f388cf
Commiting a few minor fixes to glut fbdev (segfault on a separate stack)
...
Updated all drivers that used the old _ac_ functions to use
the new _vbo_ functions. I know this fixed the fbdev driver,
it looks like it might fix some other drivers too.
2007-02-16 17:44:13 -07:00
Sean D'Epagnier
af0190bc6e
Updated keyboard input so that glut programs can read from stdin without
...
problems if tty input is used. Also corrected a few stdin keycodes.
2006-12-21 01:50:33 -07:00
Claudio Ciccani
73fdecca9f
Remove DirectFBGL header from Mesa bacause since 1.0.0 DirectFB installs its own header.
...
Updated to the current DirectFBGL interface (i.e. added GetProcAddress()).
2006-12-01 14:12:05 +00:00
Sean D'Epagnier
10cbd089ae
the following improvements to linux-fbdev:
...
1. updated makefiles to build libOSMesa as well as libGL
these are improvements to fbdev-glut
1. mouse cursor will timeout and be invisible if not being used
2. do not restore colormaps to truecolor targets, this causes problems at
exit on my g450
3. fixed a crash when cleaning up from failure by munmaping what had not
yet been mmaped
4. Resize event handling is improved, the resize function is not invoked
from a signal handler now.
5. The main loop can detect if it is running very fast (greater than 2khz)
6. keyboard up and special up events are generated from stdin input mode
and if it is also not redrawing, it sleeps
7. corrections in escape sequences for function keys for stdin input
2006-11-30 03:25:28 +00:00
Sean D'Epagnier
0570fcfd93
Added correct include files to files,
...
No longer modify cmap if the device is truecolor (messes up dual monitors
with vt switching)
2006-11-21 09:35:49 +00:00
Brian Paul
464fcd0dd8
New bin/minstall script - a minimal replacement for 'install'.
...
Correctly handles symlinks so we can get rid of the COPY_LIBS stuff.
2006-10-19 20:09:05 +00:00
Brian Paul
1d914fe465
remove obsolete comment
2006-09-27 14:00:37 +00:00
Sean D'Epagnier
e184bd861c
corrected cursor drawing
...
added handling of SIGWINCH
fixed input of recieving SIGIO while handling SIGIO
corrected input code for return
uncommented normal calculation to models
2006-09-24 10:57:26 +00:00
Brian Paul
81e0d73780
GLUT_FORCE_VISUAL env var to force glut to use a particular visual (debug only)
2006-09-21 15:16:36 +00:00
