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
Brian Paul
37f452096b
don't need to use LOD version of texture2D() funcs
2008-08-15 17:02:09 -06:00
Brian Paul
b9c6f2b133
mesa: added new glsl/pointcoord.c test
2008-08-13 08:49:39 -06:00
Brian Paul
60b92129b1
mesa: clear the unused upper-left region to black instead of leaving it undefined
2008-08-13 08:46:50 -06:00
Guillaume Melquiond
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
Brian Paul
51bfb6aa99
query/print GLSL version string
2008-07-24 15:11:11 -06:00
Thomas Hellstrom
7c2d7f8cf5
Fix a typo.
2008-07-24 13:35:35 +02:00
Thomas Hellstrom
9dd73d58ae
Add new demo "fbo_firecube".
...
Tests fbo render-to-texture for various internal texture image formats.
2008-07-24 13:32:59 +02:00
Zack Rusin
4d38d86b2c
add edge detection to that example
2008-07-21 19:19:22 -04:00
Guillaume Melquiond
4430597bf6
fix gltrace (bug 16691)
2008-07-14 08:50:36 -06: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
Brian Paul
547e487df2
mesa: call glutDestroyWindow() on exit
2008-07-09 15:52:04 -06:00
Jakob Bornecrantz
52912d8616
egl: Add egltri
...
First tri for EGL drivers with mesa screen ext
2008-07-04 19:33:09 +02:00
Brian Paul
2ce4b985a5
press 'm' to toggle multisample enable/disable
2008-07-01 08:49:12 -06:00
Corbin Simpson
543893eefd
Revert accidental edit to progs/demos/lodbias.
...
*puts yet another paper bag over head*
2008-06-29 10:32:19 -07:00
Nicolai Haehnle
0918023c28
demos/shadowtex: Don't set TEXTURE_WRAP_T for 1D texture
...
The operation doesn't really make sense. It triggered a bug in the r300 DRI
driver (and possibly other drivers that simulate 1D textures via 2D textures).
I've added an isolated test case for this bug to Piglit, so everybody wins.
2008-06-29 17:34:14 +02:00
José Fonseca
fd6676c249
Fix CRLF line endings.
2008-06-24 22:26:19 +09:00
Jakob Bornecrantz
ba344753b1
tests: Added a test for a strange bug in texstore_a8
2008-06-18 19:07:07 +02:00
seventh guardian
7db9034b04
added ARCH_FLAGS
2008-06-16 15:10:14 -06:00
Jakob Bornecrantz
4e52fa9b91
git: Updated .gitignore files
2008-06-16 12:20:17 +02:00
Corbin Simpson
588abd6696
r300: Fix new incarnation of bug 3195.
...
tests/bug_3195 doesn't render right, but at least it doesn't segfault this way.
2008-06-16 01:21:42 -07:00
Jakob Bornecrantz
d89b1e4a03
trivial: Update clear-undefined
2008-06-13 19:18:56 +02:00
Jakob Bornecrantz
39bd7eb6dc
trival: Added test for undefined context of buffer
2008-06-13 17:45:55 +02:00
Zack Rusin
f49dd47dc9
add some glsl example testing different arrays of uniforms
2008-06-12 14:15:37 -04:00
Dan Nicholson
0440f5a187
Update .gitignore for progs/glsl
2008-06-12 06:37:45 -07:00
Keith Whitwell
3bdeff5bec
trivial: add test for integer vertex arrays
2008-06-11 09:19:48 +01:00
Keith Whitwell
ac833b9aef
trivial: add trifan tests
2008-06-10 14:48:57 +01:00
Keith Whitwell
f5801fba24
trivial: add poly-flat-clip tests
2008-06-10 14:48:57 +01:00
Keith Whitwell
d915f40195
trivial: add tristrip-flat to makefile
2008-06-10 14:48:57 +01:00
Brian Paul
f8c6b6628d
minor changes
2008-06-05 15:37:17 -06:00
