Commit Graph

1237 Commits

Author SHA1 Message Date
Alan Hourihane 4df482086e Merge commit 'origin/master' into gallium-0.2
Conflicts:
	windows/VC8/mesa/osmesa/osmesa.vcproj
	windows/VC8/progs/demos/gears.vcproj
	windows/VC8/progs/progs.sln
2009-01-22 09:43:42 +00:00
Jakob Bornecrantz c14aac5530 progs: Ignores 2009-01-21 15:01:13 +01:00
Brian Paul f97792421b tests: test pseudo-XOR blend mode.
GL_XOR logicop mode can be approximated with blending by computing 1 - dst.
Here's a couple test programs for that.
2009-01-19 12:09:40 -07:00
Keith Whitwell b5db6b039c Merge commit 'origin/gallium-0.2' into gallium-xlib-rework 2009-01-19 10:15:04 +00:00
Jakob Bornecrantz 1fd411539b egl: eglinfo load i915 driver 2009-01-19 02:29:54 +01:00
Jakob Bornecrantz 94ddd621d1 egl: Make eglscreen sleep for five seconds 2009-01-18 13:40:24 +01:00
Jakob Bornecrantz b6b619c6ff egl: Add eglscreen to help debug egl mesa screen 2009-01-18 05:14:01 +01:00
Jakob Bornecrantz a5df724c52 egl: Make eglinfo print screen info 2009-01-17 20:50:00 +01:00
Keith Whitwell 2d155f91d2 trivial: clear with random color 2009-01-14 20:33:06 +00:00
Alan Hourihane e82784559e mesa: add new samplers_array test 2009-01-14 17:01:16 +00:00
José Fonseca eb1f01a9d9 progs: List tri-clear. 2009-01-14 11:40:31 +00:00
Younes Manton 6cee4b8d7e mesa: Update .gitignore 2009-01-10 14:11:30 -05:00
Jakob Bornecrantz 5256f94b1a progs/glsl: Add ignores 2009-01-05 11:52:30 +01:00
Jakob Bornecrantz b2e9d415ed progs/glsl: Remove double target def for vert-or-frag-only 2009-01-05 11:52:30 +01:00
Brian fa4fec2d1b demos: remove redundant Makefile lines from prev merge 2009-01-03 14:39:49 -07:00
Brian Paul 84cffc2e7f mesa: replace CC with APP_CC in progs/glsl/Makefile 2009-01-02 16:52:00 -07:00
Brian Paul 0815ebccfc Merge commit 'origin/master' into gallium-0.2
Conflicts:

	src/mesa/main/ffvertex_prog.c
	src/mesa/main/texenvprogram.c
2009-01-02 16:32:26 -07:00
Brian Paul 46b8fe00c9 demos: added progs/glsl/samplers.c to test all available texture samplers 2009-01-01 14:02:17 -07:00
Brian Paul c789bd376f Merge commit 'origin/master' into gallium-0.2
Conflicts:

	src/mesa/main/config.h
2008-12-30 18:01:15 -07:00
Brian Paul c9122072fc demos: minor fixes to twoside.c glsl demo 2008-12-30 07:24:19 -07:00
José Fonseca 9136c9b29e Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:

	src/gallium/auxiliary/util/Makefile
2008-12-22 19:31:52 +00:00
José Fonseca 229424b2d7 Ignore new tests executables. 2008-12-21 13:48:43 +00:00
Brian Paul 58a82ee57f Merge commit 'origin/master' into gallium-0.2 2008-12-19 16:56:56 -07:00
Brian Paul aae74c3698 mesa: s/CC/APP_CC/ in progs/glsl/Makefile 2008-12-19 07:57:09 -07:00
Brian Paul 6c14bdc72f demos: all glutDestroyWindow() upon exit to test query object clean-up 2008-12-18 14:17:06 -07:00
Brian Paul bde3b3a164 demos: add test of vertex-only and fragment-only shader programs 2008-12-18 14:17:06 -07:00
Brian Paul 7d41f10605 util: check for frag/vertShader=0 before attaching 2008-12-18 14:17:06 -07:00
Brian Paul f43019b226 demos: all glutDestroyWindow() upon exit to test query object clean-up 2008-12-18 11:11:59 -07:00
Brian Paul 1cb680d06b demos: add test of vertex-only and fragment-only shader programs 2008-12-17 13:58:31 -07:00
Brian Paul 637f06dcdc util: check for frag/vertShader=0 before attaching 2008-12-17 13:58:05 -07:00
Brian Paul b0caa10a85 Merge commit 'origin/master' into gallium-0.2 2008-12-16 15:50:14 -07:00
Brian Paul b8bfddf976 demos: updated tests/floattex.c (doesn't work just yet). 2008-12-15 18:19:05 -07:00
Alan Hourihane a22d865f93 Merge commit 'origin/master' into gallium-0.2 2008-12-15 11:16:03 +00:00
Gary Wong a42342cd90 Fix silly type mismatch error in multinoise demo. 2008-12-13 20:06:21 -07:00
Gary Wong d427a2910f Add "multinoise" demo, to test 1/2/3/4 dimensional noise. 2008-12-13 14:28:04 -07:00
Gary Wong 0df3dfab82 Ensure p.w is initialised in noise demo. 2008-12-13 14:25:52 -07:00
José Fonseca 500b304463 scons: Build progs.
Just demos and trivial dirs for starters.

Conflicts:

	.gitignore
2008-12-12 12:37:21 +09:00
Brian Paul 0c31661e73 Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-12-10 18:11:31 -07:00
Keith Whitwell e1645313be mesa: more trivial tests 2008-12-10 12:53:17 +00:00
Alan Hourihane e8a1b31ddf fix conflict breakage 2008-12-08 15:03:29 +00:00
Alan Hourihane 33a1f495d4 Merge commit 'origin/master' into gallium-0.2
Conflicts:

	progs/glsl/Makefile
2008-12-08 14:29:50 +00:00
Brian 39091cc638 demos: added simple vertex shader texture test.
Draw a quadmesh where Z coord is taken from a texture map.
2008-12-03 18:55:25 -07:00
Younes Manton 25eee19cd6 mesa: Update some .gitignore files. 2008-12-02 16:15:13 -05:00
Alan Hourihane c4c86bbd16 Merge commit 'origin/master' into gallium-0.2 2008-11-28 16:19:10 +00:00
Brian Paul e23122d309 demos: press SPACE to toggle fbo_firecube animation 2008-11-26 09:00:44 -07:00
Brian Paul 77762801bc remove some redundant rules from prev merge 2008-11-24 14:31:41 -07:00
Brian Paul df6155fcff Merge commit 'origin/master' into gallium-0.2
Conflicts:

	progs/glsl/Makefile
2008-11-24 14:08:58 -07:00
Brian Paul 80301866f6 added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader
Fragment's red/greenb/blue is a function gl_FragCoord.xyz
2008-11-24 13:11:05 -07:00
Jakob Bornecrantz 51af35b7cc progs: Add ignores 2008-11-24 20:05:47 +01:00
Brian Paul c45c5c4ca4 added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader
Fragment's red/greenb/blue is a function gl_FragCoord.xyz
2008-11-21 10:04:37 -07:00