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
90c93bbeee
define new APP_CC configuration variable for building apps/demos/tests
...
For Cell, need to use different compilers for the libraries vs. the demos/tests
to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
2008-09-11 11:00:54 -06:00
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
3e8e292db0
Always pass CFLAGS when compiling or linking demos
...
To ensure that the correct architecture flags are used, always pass the
user's CFLAGS when compiling or linking the demos. Fixes #16860 .
2008-07-30 07:56:42 -07:00
51bfb6aa99
query/print GLSL version string
2008-07-24 15:11:11 -06:00
d8de01ba41
sync up with glxgears.c from master
2008-06-04 16:55:19 -06:00
4c7a17c251
fix event handling issues (such as when resizing when not animating)
2008-06-04 16:11:24 -06:00
6d9c3fa0c2
press 'a' to toggle animation
2008-06-04 16:04:04 -06:00
c35e021f37
code refactoring (draw_frame(0, handle_event())
2008-06-04 16:01:47 -06:00
c5342ad0d0
remove references to incorrect -winwidth/-winheight, replace with -geometry
2008-06-04 15:56:30 -06:00
77ce568ff7
Remove CVS keywords.
2008-05-26 20:14:40 +09:00
019fc3aa04
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-21 17:15:07 +01:00
f869ddf297
add new binaries to ignore to make 'git status' cleaner
2008-05-20 19:18:22 -04:00
12a317b93a
updated options/help
2008-05-07 18:11:06 -06:00
8f76459f62
mesa: document a/s keys
2008-05-07 11:57:46 -06:00
f34a30bf79
mesa: add texturing to thread test
...
Run with -t to enable texture mapping.
Press 't' to update the texture image. When the texture is changed in one
thread it should also get updated in the other threads since textures are
shared by all contexts.
2008-05-07 11:57:46 -06:00
a2b73c74b0
Ignore xdemos/sharedtex
2008-05-05 15:16:52 -07:00
07b551f7cf
added xdemos/sharedtex.c test
...
Test that modifications to a texture object in one rendering context are seen
in a second rendering context.
Press 't' to change the texture's image/colors.
2008-04-30 15:30:29 -06:00
9a43570f8c
added xdemos/sharedtex.c test
...
Test that modifications to a texture object in one rendering context are seen
in a second rendering context.
Press 't' to change the texture's image/colors.
2008-04-30 14:45:58 -06:00
96b4ac05be
silence warning
2008-04-03 20:12:32 -06:00
bcb61987fb
Fix xdemos build on FreeBSD: <sys/types.h> before <netinet/tcp.h>
2008-03-21 14:19:30 -07:00
7c7fece977
Darwin: Config/source fixes to now build glxdemo apps and OSMesa
...
Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config
(cherry picked from commit 7120c0089d663a2b7e7b0c97da38f9bc233fbdd7)
2008-03-10 15:21:39 -07:00
51cd168da4
glxgears: oops, remove accidental commit of glFinish() hack.
2008-02-29 15:33:40 -05:00
6cb3f5c4d8
Use __DRIextension mechanism providing loader functionality to the driver.
...
Instead of passing in a fixed struct, the loader now passes in a list
of __DRIextension structs, to advertise the functionality it can provide
to the driver. Each extension is individually versioned and can be
extended or phased out as the interface develops.
2008-02-29 15:05:39 -05:00
2d38d1b300
Remove files of unsupported build systems.
2008-02-25 17:11:28 +09:00
8c8107118e
Ignore glxgears_pixmap
2008-02-17 19:34:48 -08:00
5961ed5fbc
Add GLXPixmap version of glxgears to show case new GLX Pixmap functionality.
2008-02-14 22:05:55 -05:00
e1ae5b89fc
glxinfo: Fix multisample visual reporting.
...
strstr() == 0 tests for the string _not_ being present. Originally
Red Hat bug #351871 .
2008-01-22 14:57:20 -05:00
6bd32cbcf3
Don't build yuvrect_client by default
...
Added 'extra' rule to build optional yuvrect_client, shape, xdemo programs
2008-01-22 07:57:33 -07:00
60dd3b1d9a
remove unused var
2008-01-22 07:57:33 -07:00
e58c365cda
define M_PI if needed
2008-01-22 07:57:33 -07:00
f6ab1347d6
remove dependency on libGLU
2007-11-12 08:02:09 -07:00
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
c05aa5ec4c
specify app lib dependencies in Makefiles (patch 1/3)
2007-10-29 09:03:01 -06:00
414a933ad2
Ignore generated files.
2007-10-25 23:25:02 +01:00
8578534f48
Ignore new programs
2007-10-25 11:34:16 -07:00
a074857cdc
glxinfo: Try creating a GLX context using an fbconfig if no visuals are available.
2007-10-18 15:19:38 -04:00
aad5c0fdc7
pbutil: Do not require GLX_SGIX_pbuffer for fbconfig only-functions.
2007-10-17 17:04:59 -04:00
a5b4bb393f
glxinfo: Also print number of fbconfigs.
2007-10-17 15:06:11 -04:00
87966baa8d
Fixup a couple of thinkos in glxinfo changes.
2007-10-17 10:15:10 -04:00
791ad0e77f
Implement support for printing glx fbconfigs in glxinfo.
2007-10-16 16:07:52 -04:00
f7d1d554b1
glxinfo: Only print visuals that actually support GLX.
2007-10-16 16:07:52 -04:00
c095f7e46a
Do XSync() before resetting error handler.
2007-10-13 18:46:01 -04:00
72c888869f
Example of cooperative rendering into one window by two processes
2007-10-11 18:25:12 -06:00
f1104b079f
New glxsnoop demo to display another window's z/stencil/back buffer.
2007-10-11 16:39:02 -06:00
b182613f2f
Ignore more generated files in progs/
...
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
2007-10-10 08:44:58 -06:00
2a3e33865d
add support for LDFLAGS env var
2007-09-28 18:42:21 -06:00
b74140db66
Update .gitignore for tests and xdemos.
2007-09-24 10:26:40 -07:00
24cd84162e
clean-up (see bug 12317)
2007-09-10 08:37:09 -06:00
5dab3bf4bc
xdemo case: Wei Wang's patch for bug#9759
2007-08-14 11:39:23 +08:00
Keith Whitwell
Brian Paul
Guillaume Melquiond
José Fonseca
Michel Dänzer
Zack Rusin
Dan Nicholson
Eric Anholt
Jeremy Huddleston
Kristian Høgsberg
Adam Jackson
Alexey Sokolov
Michal Krol
Xiang, Haihao