Brian Paul
b3a68b24bd
replace 1.0/sqrt() with inversesqrt()
2008-10-10 12:04:49 -06:00
Keith Whitwell
d7f1cb5b5a
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
src/gallium/auxiliary/gallivm/instructionssoa.cpp
src/gallium/auxiliary/gallivm/soabuiltins.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/mesa/main/texenvprogram.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/prog_statevars.c
src/mesa/state_tracker/st_draw.c
src/mesa/vbo/vbo_exec_draw.c
2008-10-10 15:23:36 +01:00
Brian Paul
02aea66b1a
mesa: toggle colormask values with r/g/b keys in tri-mask-tri.c
...
Plus misc clean-up.
2008-10-09 19:51:26 -06:00
Brian Paul
f6e806a2b8
mesa: simple multiple textures test
2008-10-09 19:51:26 -06:00
Brian Paul
b99c39ea7b
mesa: use the shaderutil.c helper functions
2008-10-07 16:24:43 -06:00
Stephane Marchesin
6f29c2ff2d
Progs: hook the glsl identity example into the makefile.
2008-10-07 23:42:36 +02:00
Stephane Marchesin
4ccbee2439
Progs: add a trivial glsl test, useful for gallium driver bringup/debug.
2008-10-07 21:21:20 +02:00
Keith Whitwell
1ec78df1e7
trivial: add more vp tests
2008-10-07 19:14:18 +01:00
Keith Whitwell
a381c9e8b3
trivial: exercise vertprog sligtly
2008-10-07 16:33:52 +01:00
Alan Hourihane
d142f216d2
link EGL demos with -lGL
2008-09-26 11:20:20 +01:00
Keith Whitwell
3a40dee3eb
Merge commit 'origin/gallium-0.1' into gallium-0.2
2008-09-21 12:22:21 -07:00
Jakob Bornecrantz
866a2c3ccb
mesa: Update ignores a bit
2008-09-19 12:43:47 +02:00
Robert Ellison
4485ac87c2
CELL: mark several transient files as .gitignore
...
progs/demos: added new demo "fbo_firecube"
progs/glsl: added new demo "pointcoord"
src/gallium/drivers/cell/spu: added the g3d_spu executable, a Cell SPU
executable file, which seems to be occasionally built as part of the
cell driver
src/glu/sgi: added "exptmp", a byproduct of the "mklib" process that
sometimes gets deleted and sometimes not.
2008-09-18 16:36:37 -06:00
Brian Paul
a9004cc79c
destroy window on exit
2008-09-18 15:37:13 -06:00
Keith Whitwell
a8d1521f30
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
src/mesa/shader/slang/slang_link.c
2008-09-18 19:07:33 +01:00
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
Jakob Bornecrantz
fa7529335c
progs/fp: Add a bit of local variable testing to fp-tri
2008-09-18 14:14:56 +02:00
Brian Paul
3b3d34d637
egl: print multisample info
2008-09-17 15:29:59 -06:00
Brian Paul
05aeb92a09
cell: dump generated code if CELL_DEBUG=asm
2008-09-17 08:14:09 -06:00
Keith Whitwell
a30d2c5727
add dlist-degenerate test case
2008-09-15 13:49:04 +01:00
Brian Paul
870afb8319
negate.txt - test negation of a src reg
2008-09-13 15:33:07 -06:00
Guillaume Melquiond
5d4c8ec5e0
remove invalid XDestroyWindow() call
2008-09-13 14:22:15 -06:00
Guillaume Melquiond
ee2c8d6d3e
silence warning
2008-09-13 14:21:50 -06:00
Jonathan White
272810125b
Makefile was previously checked in with merge diffs still present. I just selected HEAD and removed the old.
2008-09-12 13:25:40 -06:00
Brian Paul
c436f96b10
simple add with swizzle and mul with swizzle tests
2008-09-12 08:40:50 -06:00
Keith Whitwell
522139dd14
vp: add run script
2008-09-12 10:31:51 +01:00
Keith Whitwell
176c454765
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
progs/fp/Makefile
2008-09-12 10:31:23 +01:00
Keith Whitwell
1f13545679
fp: put test name in window title, add run script
2008-09-12 10:28:36 +01:00
Keith Whitwell
52a9dfd4fe
use APP_CC, remove redundant target
2008-09-12 10:02:16 +01:00
Brian Paul
dbbbc33344
use APP_CC
2008-09-11 17:55:53 -06:00
Keith Whitwell
fd0ee68305
trivial: remove stray merge conflict
2008-09-11 20:11:11 +01:00
Keith Whitwell
a90cae8a17
demos: fix LIBS ref in makefile
2008-09-11 20:07:41 +01: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
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
Brian Paul
5c459b3925
simple quad drawing test
2008-09-11 10:43:14 -06:00
Brian Paul
83054d9297
press 'c' to toggle Z clear value between 0/1
2008-09-11 10:39:27 -06:00
Brian Paul
8df4c3a21f
press 'f' to cycle through depth test funcs
2008-09-11 10:39:27 -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
Brian Paul
380385ab7d
mesa: added test for very long fixed-function vertex programs
2008-08-28 15:22:44 -06:00
Brian Paul
8f1d5ca086
use ftransform()
2008-08-20 15:33:03 -06:00
Michal Krol
47e14cc093
Add NV_vertex_program specific tests.
2008-08-19 14:44:41 +02:00
Michal Krol
2858ec66c2
Add support for NVIDIA programs.
2008-08-19 14:43:19 +02:00
Michal Krol
5b16730df8
Port vp to Windows.
2008-08-19 00:44:09 +02:00
Alan Hourihane
5c9d0c7052
pick first mode
2008-08-17 21:59:00 +01:00
Alan Hourihane
b6db08a91b
choose a 1024x768 resolution
2008-08-17 19:13:17 +01:00
Corbin Simpson
567d87744a
added test for ARB GLSL extensions
2008-08-16 11:07:51 -06:00
Brian Paul
35479fd4b4
fix convolutions test to consistanty use the ARB shader extension functions
...
Was using a mix of the ARB functions and the OpenGL 2.0 shader functions.
2008-08-16 09:54:07 -06:00
Brian Paul
c0dd9122fd
remove .txt suffix from shader source files
2008-08-16 09:36:46 -06:00
Brian Paul
ce00d232f3
mesa: added glsl/convolutions test from gallium branch
2008-08-16 09:34:12 -06:00
Brian Paul
1b39b92e6d
draw a tristrip ring instead of a single quad
2008-08-15 17:02:09 -06:00
