Commit Graph

1528 Commits

Author SHA1 Message Date
Keith Whitwell 993b7e1d5c progs/vp: add pointsize + clamp test 2009-03-24 17:50:36 +00:00
Keith Whitwell eb9801ccfb progs/trivial: add fflushes for cygwin 2009-03-24 16:35:29 +00:00
Keith Whitwell 2312f697a2 progs/trivial: draw non-interleaved arrays out of one vbo 2009-03-24 15:30:53 +00:00
Jakob Bornecrantz 39320c1bee progs/tests: Build texcompress2 with scons 2009-03-24 13:26:39 +01:00
Keith Whitwell 1a28750b43 vpglsl: add missing SConscript 2009-03-23 19:01:40 +00:00
Keith Whitwell 103a4bd711 progs/fp: pass texcoord to triangle, add a test shader 2009-03-23 18:39:36 +00:00
Michal Krol cf0122e892 progs/wgl: Send a resize message after context have been created. 2009-03-20 16:48:54 +01:00
Michal Krol 9bbffcced4 progs/wgl: Create GL context in a thread that actually uses it. 2009-03-20 16:16:49 +01:00
Michal Krol e8aa5a1018 progs/wgl: Make context current to get GL_RENDERER string. 2009-03-20 16:13:39 +01:00
Michal Krol 1342664434 wgl: Add an `-s' option to wglthreads to force single-threaded operation. 2009-03-19 11:16:01 +01:00
José Fonseca 1f118c2557 progs: Build the wgl examples with scons. 2009-03-18 16:40:57 +00:00
Jakob Bornecrantz 3f17030d9c progs/trivial: Make quad-tex-sub repeat patterns 2009-03-18 17:27:34 +01:00
Brian Paul 4c460cfd2b tests: remove/update old comments 2009-03-18 10:24:19 -06:00
Jakob Bornecrantz 87bcb328c1 progs/trivial: Add quad-tex-sub
Tests glTexSubImage
2009-03-18 17:17:45 +01:00
Keith Whitwell f02aaa83c1 tests: add simplest mipgen test 2009-03-18 14:13:59 +00:00
Jakob Bornecrantz a528eb51eb progs/tests: Update mipmap_limits to show image and colors 2009-03-18 13:30:34 +01:00
Jakob Bornecrantz ae36fadb7f progs/trivial: Add tri-fbo-tex-mip
Tests rendering to mip levels other then first
2009-03-18 11:30:34 +01:00
Michal Krol f20a0155f3 wgl: Port sharedtex_mt to WGL. 2009-03-17 14:27:47 +01:00
Thomas Hellstrom 1d2b14cf56 xdemos: Fix sharedtex_mt.
1) Don't allow multiple threads sharing current context,
   even if they are mutex protected.
2) Remove all XLockDisplay(), XUnLockDisplay() calls, as they were
   only workarounds for xcb.

Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
2009-03-17 11:38:00 +01:00
Jakob Bornecrantz 2f52c7f901 progs/trivial: Ignores 2009-03-16 20:15:25 +01:00
Jakob Bornecrantz 2004b99b83 progs/tests: Ignores 2009-03-16 20:15:18 +01:00
José Fonseca e5a3aa5672 progs: Try to read the texture from the current dir, if full path fails. 2009-03-16 12:01:44 +00:00
Michal Krol ad908465f1 wgl: Port glthreads to WGL. 2009-03-16 09:45:23 +01:00
Younes Manton 474399ddd6 mesa: .gitignore 2009-03-14 20:20:56 -04:00
Thomas Hellstrom 8132405d52 xdemos: Add multithreaded sharedtex_mt.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
2009-03-13 15:06:54 +01:00
Keith Whitwell 48012157ba vp: add test for pointsize output 2009-03-13 11:57:15 +00:00
José Fonseca 188a3334f8 progs: Add util to cpp path. 2009-03-13 11:48:13 +00:00
Keith Whitwell dbc3e8e93f progs/vp: add keys for point prims, etc, and various new tests 2009-03-13 11:32:32 +00:00
Brian Paul 8b2ecfdd5c demos: move declaration before code 2009-03-12 17:21:05 -06:00
Keith Whitwell f16da8d509 trivial: draw non-interleaved arrays 2009-03-12 17:21:50 +00:00
Brian Paul 6aa6ae8cff demos: fix error string, comment 2009-03-12 09:31:59 -06:00
Brian Paul 4626e57e17 demos: fix typo 2009-03-12 09:19:28 -06:00
Keith Whitwell 1e074dcb7b demos: use glGenerateMipmapEXT entrypoint in cubemap.c
glGenerateMipmap() is part of ARB_framebuffer_object, which many mesa
drivers don't advertise.  Add check for EXT_framebuffer_object.
2009-03-12 14:30:49 +00:00
Roland Scheidegger 45b8e76b5c mesa test prog for ATI_envmap_bumpmap 2009-03-12 15:07:22 +01:00
Jakob Bornecrantz b7d841b59e progs/glsl: Ignore 2009-03-12 14:05:50 +01:00
Alan Hourihane b6c7db8deb xdemos: On termination with `esc` close the contexts correctly. 2009-03-11 13:35:27 +00:00
Keith Whitwell a58065d4e2 progs/tests: compile with SCons and glew
Also get mingw cross-compilation of these tests working
2009-03-10 13:11:23 +00:00
Keith Whitwell 225de01f83 trivial: add a logic op test 2009-03-10 12:06:27 +00:00
Keith Whitwell 646f518e78 vpglsl: add simple mov.glsl 2009-03-10 12:06:27 +00:00
Keith Whitwell ce0ac9006a vpglsl: build with scons and glew 2009-03-09 18:51:14 +00:00
Brian Paul 0e28e1a72f demos: in progs/demos/cubemap.c press c/f to cycle through clamp/filter modes
Also generate a mipmap for the default checker images.
2009-03-09 11:49:57 -06:00
Keith Whitwell 48b1fe12b1 trivial: add tri-stipple to SConscript 2009-03-09 15:20:12 +00:00
Keith Whitwell fb8a9875f6 fp: enable a second texture unit and add a kil test for it 2009-03-09 14:08:52 +00:00
Keith Whitwell 185ff38895 fp: add some more texture, position and kill tests 2009-03-06 21:15:19 +00:00
Keith Whitwell 2dd9a0197c fp: new kill + position test 2009-03-06 21:00:18 +00:00
Keith Whitwell 52a68b9078 fp: dont reference fragment.position.zw 2009-03-06 21:00:18 +00:00
Keith Whitwell b258320dbd engine: also print fps data to stdout
Useful for figuring out how much of a perf impact the glBitmap fps
display has on a given driver.
2009-03-06 21:00:18 +00:00
Brian Paul b5d3c17427 tests: add new mapbufrange.c test to test GL_ARB_map_buffer_range
This only tests the most basic functionality for now.
2009-03-04 21:03:29 -07:00
Keith Whitwell 59311fb06c clear-repeat: print fps, use 300x300 window size 2009-03-04 21:37:23 +00:00
Keith Whitwell 39a1a24b3f demos/engine: respect display list mode when drawing pistons 2009-03-03 15:40:14 +00:00
Brian Paul fe35378769 demos: add progs/glsl/shadow_sampler.c to test GLSL shadow2D(), etc.
Heh, I wrote this program a long time ago but just discovered today that
it wasn't in git.
2009-02-28 11:09:13 -07:00
Brian Paul 07f96a6d8e demos: fix renderbuffer leak in progs/tests/fbotexture.c
And re-org some code for testing purposes.
2009-02-27 15:57:46 -07:00
Brian Paul b6e2dd6e06 tests: new mapvbo.c test
Test that glDrawArrays() isn't effected by a glMapBuffer()/modify/glUnmapBuffer()
immediately afterward.
2009-02-27 11:46:38 -07:00
Brian Paul c710077807 demos: add a fourth test case to VBO test for position/color in different VBOs 2009-02-26 18:48:35 -07:00
Jakob Bornecrantz bd2f921d78 trivial: Add tri-viewport 2009-02-21 12:02:19 +01:00
Jakob Bornecrantz b3bd315e57 trivial: Fix indentation in tri 2009-02-21 12:02:18 +01:00
Keith Whitwell e6479c6250 demos: add some fflushes for windows 2009-02-24 12:14:50 +00:00
Jakob Bornecrantz 4e37f10806 trival: Make the last of progs show the name 2009-02-19 22:50:18 +01:00
Jakob Bornecrantz ec2e4e1fed trivial: Add quadstrip-clip 2009-02-14 09:42:28 +01:00
Jakob Bornecrantz 96c773c77b progs: Make fp-tri use glew and add scons target 2009-02-14 07:04:01 +01:00
Keith Whitwell defd52f6c7 progs/trivial: Label program windows with actual program name
Each of these programs previously called itself "First Tri" which was a
little confusing.  Could have left one as "First Tri", but the trouble
then is that people would still clone that file & we'd end up with
another thousand first tri apps...
2009-02-18 18:22:23 +00:00
Jakob Bornecrantz b6779056a1 trivial: Make tri-fog a bit more interesting to look at 2009-02-13 23:03:57 +01:00
Jakob Bornecrantz b57031624e trivial: Add a tri-unfilled-fog test 2009-02-13 21:18:41 +01:00
Jakob Bornecrantz 54e20828e6 demos: Add polygon mode point to isosurf 2009-02-13 17:53:49 +01:00
Alan Hourihane cfae542d1f demos: fix glxpixmap and call glXWaitGL before calling XCopyArea. 2009-02-16 11:56:21 +00:00
José Fonseca 7ef8e4e181 progs: Prevent clash with min macro. 2009-02-12 13:54:55 +00:00
Brian Paul b6ad7c8c4a demos: minor updates for shader_api.c test
Mesa's glGetUniformLocation() does support array indexes.

Minor code reformatting.

It would be great if this program were converted into a glean test...
2009-02-11 09:17:22 -07:00
Brian Paul 5f75013822 demos: better error message for overlay.c, see bug 20055 2009-02-11 07:53:56 -07:00
Brian Paul 5340b6dff7 Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.

Conflicts:

	progs/demos/Makefile
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c
2009-02-10 16:44:02 -07:00
Brian Paul ee4c921b65 Merge commit 'origin/gallium-0.2' into gallium-master-merge 2009-02-10 16:34:51 -07:00
José Fonseca 52233f27bb progs: Build samples dir with scons and glew. 2009-02-10 20:28:08 +00:00
José Fonseca 8b9aa730c6 progs: Build rebook with scons too. 2009-02-10 20:18:52 +00:00
Brian 028780a809 demos: remove OSMESA stuff from Makefile 2009-02-09 19:40:10 -07:00
Brian Paul e97681c7f5 mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge

Conflicts:

	Makefile
	docs/relnotes-7.4.html
	docs/relnotes.html
	src/mesa/drivers/dri/i965/brw_wm.h
	src/mesa/main/imports.c
	src/mesa/main/mtypes.h
	src/mesa/main/texcompress.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/version.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_save_draw.c
2009-02-09 09:22:22 -07:00
Brian Paul c06c74c0b8 demos: remove unused function 2009-02-04 16:33:25 -07:00
Brian Paul 906c60d0b7 demos: silence uninitialized var warning 2009-02-04 16:33:25 -07:00
Brian Paul dd22f6f795 demos: modify bufferobj.c to exercise interleaved vertex arrays
Also, put colors before vertex positions, and place the data at a 40-byte
offset from the start of the buffer.
2009-02-03 15:17:26 -07:00
Brian Paul 8e8b25c26a demos: update multitex.c GLSL demo to use vertex arrays or glVertex-mode
Press 'a' to toggle drawing mode.
2009-02-02 16:51:45 -07:00
Brian Paul 4c5f390328 util: added more functions to extfuncs.h 2009-02-02 16:51:45 -07:00
Ian Romanick 5b5ddfb89c glxgears: No, really. Fix the dyslexia. 2009-02-01 11:56:07 -08:00
José Fonseca 9aa73cfae8 progs: Get more samples building on windows. 2009-02-01 12:00:17 +00:00
Ian Romanick 9d6880ec8d Fix dyslexia. 2009-01-30 14:55:42 -08:00
Ian Romanick 58b9cd411f glxgears: Log a message if synched to vblank
Tries to use either GLX_MESA_swap_control or GLX_SGI_video_sync to
detect whether the display is synchronized to the vertical blank.  If
it detects this, a message will be printed.  HOPEFULLY this will
prevent some of the bug reports such as "glxgears only gets 59.7fps.
What's wrong with my driver?"
2009-01-30 14:45:01 -08:00
José Fonseca efdb7799d3 progs: Fix isosurf. 2009-01-24 16:47:50 +00:00
José Fonseca 2e61d136c2 progs: Port most of the demos to glew.
A couple of test weren't ported due to glew breakage -- it undefines
GLAPIENTRY.
2009-01-24 16:39:49 +00:00
José Fonseca 9bf83fb016 scons: Build the progs into seperate dirs as well. 2009-01-24 15:56:28 +00:00
José Fonseca 528a0a885e progs: Port vp-tris to glew.
There was some wglGetProcAddress calls to setup extensions already, but
including glext caused many compilation errors in MinGW.
2009-01-23 17:09:51 +00:00
José Fonseca 483c730de8 progs: Ignore more output executables. 2009-01-23 14:37:35 +00:00
José Fonseca 479ea7d87b progs/trivial: Use glew where needed.
Builds on windows now.
2009-01-23 14:35:36 +00:00
Brian Paul 0906f47c1f demos: revamp the fbotexture.c demo
Try making depth/stencil attachments in two different ways.
Check for GL errors and GL_FRAMEBUFFER_UNSUPPORTED status to be more robust.
Reorganize the code a bit to make it clearer.
Added -arb option to test GL_ARB_fbo's mixed renderbuffer sizes
Added -ds2 option to test GL_DEPTH_STENCIL_ATTACHMENT
2009-01-22 15:25:10 -07:00
Brian Paul aed7403f32 demos: updated FBO tests to for ARB_fbo
Some things that were not errors in EXT_fbo are errors in ARB_fbo.
2009-01-22 15:22:54 -07:00
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
José Fonseca 72ebf4fd03 scons: Build progs.
Just demos and trivial dirs for starters.
2008-11-21 10:44:30 +09:00
Keith Whitwell 7468765b18 Merge commit 'origin/master' into gallium-0.2
Conflicts:

	src/mesa/shader/prog_print.c
2008-11-15 16:53:24 +00:00
Keith Whitwell 5e1454a036 Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:

	src/mesa/drivers/dri/common/dri_util.c
2008-11-15 16:23:31 +00:00
Keith Whitwell d04caf2ce4 trivial: more tests 2008-11-14 18:00:43 +00:00
Alan Hourihane db20a65a39 mesa: fix build 2008-11-14 14:30:49 +00:00
Eric Anholt 72bbc89534 Add glsync demo program from jbarnes for testing vblank synchronization. 2008-11-12 13:07:23 -08:00
Brian Paul 19e4222f93 Merge commit 'origin/master' into gallium-0.2
Conflicts:

	src/mesa/shader/prog_execute.c
	src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-11 14:42:41 -07:00
Brian Paul 90246d3ea5 mesa: fix version check in dinoshade.c 2008-11-11 14:35:39 -07:00
Robert Ellison 90027f8578 CELL: two-sided stencil fixes
With these changes, the tests/stencil_twoside test now works.

- Eliminate blending from the stencil_twoside test, as it produces an
  unneeded dependency on having blending working

- The spe_splat() function will now work if the register being splatted
  and the destination register are the same

- Separate fragment code generated for front-facing and back-facing
  fragments.  Often these are the same; if two-sided stenciling is on,
  they can be different.  This is easier and faster than generating
  code that does both tests and merges the results.

- Fixed a cut/paste bug where if the back Z-pass stencil operation
  were different from all the other operations, the back Z-fail
  results were incorrect.
2008-11-11 13:57:10 -07:00
Brian Paul e5359401d6 undo accidental changes to multitex.frag shader 2008-11-10 12:39:36 -07:00
Brian Paul 2c204bbf77 use APP_CC, not CC for skinning demo 2008-11-05 17:14:23 -07:00
Alan Hourihane 2382dc8aff Merge commit 'origin/master' into gallium-0.2 2008-11-05 11:59:12 +00:00
Brian Paul aab429c8df added glsl/skinning.c test to test matrix blending/weighting 2008-11-04 16:56:59 -07:00
Brian Paul 35a9f1bccf print err msg if unable to open shader file 2008-11-04 16:55:18 -07:00
Brian Paul d3222cb1d4 remove old debug glFlush/Finish calls from demos 2008-11-04 16:55:18 -07:00
Robert Ellison 711f8a1dd9 CELL: stencil bug fixes
Two definitive bugs in stenciling were fixed.

The first, reversed registers in the generated Select Bytes (selb)
instruction, caused the stenciling INCR and DECR operations to
fail dramatically, putting new values in where old values were
supposed to be and vice versa.

The second caused stencil tiles to not be read and written from
main memory by the SPUs.  A per-spu flag, spu.read_depth, was used
to indicate whether the SPU should be reading depth tiles, and was set
only when depth was enabled.  A second flag, spu.read_stencil, was
set when stenciling was enabled, but never referenced.

As stenciling and depth are in the same tiles on the Cell, and there
is no corresponding TAG_WRITE_TILE_STENCIL to complement
TAG_WRITE_TILE_COLOR and TAG_WRITE_TILE_Z, I fixed this by
eliminating the unused "spu.read_stencil", renaming "spu.read_depth"
to "spu.read_depth_stencil", and setting it if either stenciling or
depth is enabled.

I also added an optimization to the fragment ops generation code,
that avoids calculating stencil values and/or stencil writemask
when the stencil operations are all KEEP.
2008-10-30 15:24:52 -06:00
Brian Paul 54d684f23d move glut.h include 2008-10-28 19:01:38 -06:00
Brian Paul 91473dac5a mesa: use APP_CC compiler in progs/vp/ 2008-10-28 19:00:56 -06:00
Brian Paul c25adeae18 mesa: convert log/exp tests to ARB_v_p 2008-10-28 19:00:25 -06:00
Brian Paul 0a8590e3cf mesa: don't continually redraw 2008-10-28 18:18:31 -06:00
Alan Hourihane 61d3a66456 Merge commit 'origin/master' into gallium-0.2 2008-10-27 15:37:22 +00:00
Brian Paul 2278107b24 mesa: more test options in progs/demos/textures.c 2008-10-20 17:43:05 -06:00
Brian Paul 87a6fe57e8 Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:

	progs/trivial/tri.c
2008-10-17 14:13:00 -06:00
Brian Paul d422c1eb5c mesa: redraw upon keypress in trivial/tri.c 2008-10-17 13:37:50 -06:00
Brian Paul 893ea47e44 glxswapcontrol: added -fullscreen option 2008-10-16 14:33:27 -06:00
Brian Paul 9a84d78c18 glxgears: for fullscreen, disable window borders the right way 2008-10-16 14:33:27 -06:00
Brian Paul b261ed1f61 mesa: revert accidental change to fslight.c demo 2008-10-15 10:54:57 -06:00
Keith Whitwell cf85e413ad Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:

	src/mesa/main/context.c
2008-10-15 17:20:30 +01:00
Keith Whitwell 055d986efe trivial: more vp tests 2008-10-14 14:18:36 +01:00
Keith Whitwell 5548a3072f vp: add simple vertex transform test 2008-10-14 14:18:32 +01:00
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
Keith Whitwell 45efcc44c7 Remove CVS keywords.
Cherry-picked from gallium-0.1

Conflicts:

	src/glu/sgi/libnurbs/interface/bezierEval.h
	src/glu/sgi/libnurbs/interface/bezierPatch.h
	src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
	src/glu/sgi/libnurbs/internals/dataTransform.h
	src/glu/sgi/libnurbs/internals/displaymode.h
	src/glu/sgi/libnurbs/internals/sorter.h
	src/glu/sgi/libnurbs/nurbtess/definitions.h
	src/glu/sgi/libnurbs/nurbtess/directedLine.h
	src/glu/sgi/libnurbs/nurbtess/gridWrap.h
	src/glu/sgi/libnurbs/nurbtess/monoChain.h
	src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
	src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
	src/glu/sgi/libnurbs/nurbtess/partitionX.h
	src/glu/sgi/libnurbs/nurbtess/partitionY.h
	src/glu/sgi/libnurbs/nurbtess/polyDBG.h
	src/glu/sgi/libnurbs/nurbtess/polyUtil.h
	src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
	src/glu/sgi/libnurbs/nurbtess/quicksort.h
	src/glu/sgi/libnurbs/nurbtess/rectBlock.h
	src/glu/sgi/libnurbs/nurbtess/sampleComp.h
	src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
	src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
	src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
	src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
	src/glu/sgi/libnurbs/nurbtess/sampledLine.h
	src/glu/sgi/libnurbs/nurbtess/searchTree.h
	src/glu/sgi/libnurbs/nurbtess/zlassert.h
	src/glu/sgi/libutil/error.c
	src/glu/sgi/libutil/glue.c
	src/glu/sgi/libutil/gluint.h
	src/glu/sgi/libutil/project.c
	src/glu/sgi/libutil/registry.c
	src/glx/x11/glxclient.h
	src/glx/x11/glxext.c
	src/mesa/drivers/dri/ffb/ffb_dd.h
	src/mesa/drivers/dri/ffb/ffb_points.h
	src/mesa/drivers/dri/gamma/gamma_context.h
	src/mesa/drivers/dri/gamma/gamma_macros.h
	src/mesa/drivers/dri/i810/i810context.h
	src/mesa/drivers/dri/r128/r128_dd.h
	src/mesa/drivers/dri/tdfx/tdfx_dd.h
2008-09-21 11:00:44 -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
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