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
