Commit Graph

1330 Commits

Author SHA1 Message Date
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
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
Brian Paul d8de01ba41 sync up with glxgears.c from master 2008-06-04 16:55:19 -06:00
Brian Paul 4c7a17c251 fix event handling issues (such as when resizing when not animating) 2008-06-04 16:11:24 -06:00
Brian Paul 6d9c3fa0c2 press 'a' to toggle animation 2008-06-04 16:04:04 -06:00
Brian Paul c35e021f37 code refactoring (draw_frame(0, handle_event()) 2008-06-04 16:01:47 -06:00
Brian Paul c5342ad0d0 remove references to incorrect -winwidth/-winheight, replace with -geometry 2008-06-04 15:56:30 -06:00
Brian Paul 2154cb4994 egl: single triangle test 2008-06-04 11:41:37 -06:00
Brian Paul bf527cc8d4 egl: fix X visual selection 2008-06-04 11:40:25 -06:00
Brian Paul b9d35c7c44 egl: query/print EGL_NATIVE_VISUAL_ID
Other whitespace/etc clean-ups.
2008-06-04 11:36:59 -06:00
Jakob Bornecrantz 88f86c9d02 egl: Added peglgears, gears that uses pbuffers 2008-06-04 19:31:05 +02:00
Brian Paul af540ef369 egl: updated egl.h include paths 2008-06-04 10:11:25 -06:00
Brian Paul f34767f04c call glutDestroyWindow() before exit 2008-06-04 09:30:32 -06:00
Brian Paul 6b9b49127e egl: bind the OpenGL API 2008-05-30 13:46:50 -06:00
Brian Paul 80ed996803 egl: new version of gears demo that uses Xlib+EGL (and full OpenGL for now) 2008-05-30 11:47:09 -06:00
Brian Paul 8cd33faee6 egl: query/print EGL_CLIENT_APIS 2008-05-28 15:25:01 -06:00
Jakob Bornecrantz 938d9d5963 Merge branch 'gallium-vertex-linear' into gallium-0.1
Conflicts:

	src/gallium/auxiliary/draw/draw_pt_varray.c
2008-05-28 12:42:42 +02:00
Jakob Bornecrantz 3e867959e9 egl: Fix warning in eglgears 2008-05-28 11:17:14 +02:00
Jakob Bornecrantz d8a693ee49 egl: Make demo3 compile 2008-05-28 11:17:10 +02:00
Brian Paul a6af2e3345 include eglext.h, define EGL_EGLEXT_PROTOTYPES 2008-05-27 13:47:23 -06:00
Brian Paul 096b79bf17 updates for EGL 1.4 2008-05-27 13:47:07 -06:00
José Fonseca 77ce568ff7 Remove CVS keywords. 2008-05-26 20:14:40 +09:00
Jakob Bornecrantz e3ddafd1d3 Merge branch 'gallium-tex-surface' into gallium-0.1
Conflicts:

	src/gallium/include/pipe/p_util.h
2008-05-26 13:04:25 +02:00
Jakob Bornecrantz a3dbd412df Merge branch 'gallium-i915-current' into gallium-0.1 2008-05-23 16:26:14 +02:00
Keith Whitwell 2f13d4cd58 vp-tris: use test name as window name 2008-05-23 09:16:56 +01:00
Michel Dänzer 019fc3aa04 Merge branch 'gallium-0.1' into gallium-tex-surfaces 2008-05-21 17:15:07 +01:00
Brian e8d5be9c76 fix assorted bugs, works now
(cherry picked from commit 55d4f32fc2)
2008-05-21 17:13:26 +01:00
Brian 2ec318640f added readtex.h dependency 2008-05-21 07:05:29 -06:00
Zack Rusin f869ddf297 add new binaries to ignore to make 'git status' cleaner 2008-05-20 19:18:22 -04:00
Dan Nicholson 0a4867bd4c Ignore more generated files in progs/
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
2008-05-20 19:04:57 -04:00
Zack Rusin cd87aeae00 add a simple but nice example of convolution filters in glsl
shows basics of image processing with glsl
2008-05-20 18:49:51 -04:00
Brian Paul 8f792a0707 Merge branch 'gallium-0.1' into gallium-tex-surfaces 2008-05-20 15:12:50 -06:00
Brian Paul 417719c0a6 mesa: call glutDestroyWindow() 2008-05-20 15:11:33 -06:00
Brian Paul d7cf6b2978 mesa: call glutDestroyWindow() 2008-05-20 13:49:18 -06:00
Brian Paul 479174c398 Merge branch 'gallium-0.1' into gallium-tex-surfaces 2008-05-20 13:39:27 -06:00
Brian Paul a3f9ae4fea mesa: call glutDestroyWindow() 2008-05-20 13:38:59 -06:00
Brian Paul 4978953c79 new multi-texture GLSL test 2008-05-20 11:01:17 -06:00
Brian Paul 54fbd8bbd4 Merge branch 'gallium-0.1' into gallium-tex-surfaces 2008-05-18 16:17:50 -06:00
Brian Paul b86cf71491 mesa: call glutDestroyWindow() on exit to help find mem leaks 2008-05-16 16:02:52 -06:00
Jakob Bornecrantz 3f9de6ff7d egl: Updated EGL samples to use new i915 EGL winsys 2008-05-14 17:20:25 +02:00
Dan Nicholson 738d811b04 Don't link demos directly to X libraries
Since the linker will just pull in the libraries needed from libGL, we
don't need to link the demos directly to the X libraries. Fixes #15886.
2008-05-09 16:19:50 -07:00
Brian Paul 4566880656 disable GL_DEPTH_TEST before glDrawPixels in case window has unrequested depth buffer 2008-05-08 08:39:30 -06:00
Brian Paul 6a3fac8711 call glutDestroyWindow() 2008-05-08 08:37:52 -06:00
Brian Paul 79e57695e1 disable GL_DEPTH_TEST before glDrawPixels in case window has unrequested depth buffer 2008-05-08 08:33:44 -06:00
Brian Paul 12a317b93a updated options/help 2008-05-07 18:11:06 -06:00
Dan Nicholson a6464b3cb0 Never fail `make clean'
Mostly some pedantic changes such that `make clean' always ignores
errors. Also changed the top clean target to do the `touch
configs/current' dance instead of realclean.
2008-05-07 11:35:23 -07:00
Brian Paul 8f76459f62 mesa: document a/s keys 2008-05-07 11:57:46 -06:00
Brian Paul f34a30bf79 mesa: add texturing to thread test
Run with -t to enable texture mapping.
Press 't' to update the texture image.  When the texture is changed in one
thread it should also get updated in the other threads since textures are
shared by all contexts.
2008-05-07 11:57:46 -06:00
Dan Nicholson a2b73c74b0 Ignore xdemos/sharedtex 2008-05-05 15:16:52 -07:00
Brian Paul bc57a7c9f7 Press <space> to reset limit/bias values, clean-up limit/bias printf 2008-05-03 09:10:44 -06:00
Brian Paul 97709950e7 Press <space> to reset limit/bias values, clean-up limit/bias printf 2008-05-03 09:09:40 -06:00
Brian Paul 522f11b632 set TextureID = NULL after deleting the array 2008-05-02 09:31:38 -06:00
Brian Paul 07b551f7cf added xdemos/sharedtex.c test
Test that modifications to a texture object in one rendering context are seen
in a second rendering context.
Press 't' to change the texture's image/colors.
2008-04-30 15:30:29 -06:00
Brian Paul 9a43570f8c added xdemos/sharedtex.c test
Test that modifications to a texture object in one rendering context are seen
in a second rendering context.
Press 't' to change the texture's image/colors.
2008-04-30 14:45:58 -06:00
Brian Paul aef4ca647d disable GL_TEXTURE_1D at end of frame to fix failed assertion 2008-04-29 18:37:41 -06:00
Brian Paul 5692e09be8 disable GL_TEXTURE_1D at end of frame to fix failed assertion 2008-04-29 15:03:06 -06:00
Brian Paul 059ab50c60 mesa: explicitly delete textures before creating new ones
Also, call glutDestroyWindow() upon exit.
2008-04-28 14:20:11 -06:00
Keith Whitwell 63e6e33db6 trivial: simple edgeflag test 2008-04-24 12:39:09 +01:00
Keith Whitwell 1e3087cd03 mesa: add dedicated point-wide-smooth test, restore original tri.c as tri-orig.c 2008-04-23 13:10:13 +01:00
Brian Paul 6d0f9d5a01 mesa: new Z-compositing test (glDrawPixels(GL_DEPTH) + stencil) 2008-04-11 09:21:37 -06:00
Brian Paul e1c3560152 add missing glViewport calls
cherry-picked from master
2008-04-11 09:01:04 -06:00
Brian Paul b69eb0360a add missing glViewport calls 2008-04-11 08:59:39 -06:00
Brian Paul 544c236db1 mesa: add a new test for glDrawPixels(GL_DEPTH_COMPONENT) 2008-04-10 18:33:53 -06:00
Brian 842b8b4c33 more make clean items 2008-04-09 22:30:42 -06:00
Brian 26f0b8f506 use InitUniforms() 2008-04-09 22:30:42 -06:00
Brian 2dca3373ae Replace duplicated code with new shaderutil.c functions 2008-04-09 22:30:42 -06:00
Brian 90caba3d76 shader utility functions 2008-04-09 22:30:42 -06:00
Kristian Høgsberg c016f329ab Only convert configs if screen creation was successful.
Thanks to Adam Jackson for pointing it out.
2008-04-08 18:31:07 -04:00
Brian c3240b5ff8 added glGetActiveUniform_func 2008-04-04 19:28:33 -06:00
Brian 40905c909d mesa: add missing glPush/PopMatrix() calls 2008-04-04 19:28:33 -06:00
Brian ae0ea14ff6 mesa: add missing glPush/PopMatrix() calls 2008-04-04 19:28:33 -06:00
Brian 8a8e7b22c0 mesa: test code to exercise more GLSL functions 2008-04-04 18:56:22 -06:00
Brian f7f4b81ad8 mesa: added more ext funcs (from Mesa/master) 2008-04-04 18:55:48 -06:00
Brian fe1c9c0585 mesa: add missing glPush/PopMatrix() calls 2008-04-04 16:45:05 -06:00
Brian 1e4cd24e9c mesa: add missing glPush/PopMatrix() calls 2008-04-04 16:45:05 -06:00
Brian cdbfae9bef test glStencilFuncSeparateATI() 2008-04-04 12:44:14 +02:00
Brian 96b4ac05be silence warning 2008-04-03 20:12:32 -06:00
Brian 7f40115a52 mesa: added a cast to avoid int overflow, plus rename texels->pixels 2008-04-01 16:20:29 -06:00
Brian 792d524aed mesa: measure fill rate for drawing a large quad with basic shading/texture modes 2008-04-01 16:07:09 -06:00
Brian 8bef18f47b mesa: destroy window upon exit 2008-04-01 14:56:10 -06:00
Eric Anholt 227af94cce Add a couple of test apps for line/unfilled polygon clipping. 2008-03-27 11:57:08 -07:00
Brian Paul f654ab40d6 mesa: call glutDestroyWindow (help find mem leaks) 2008-03-24 17:21:18 -06:00
Eric Anholt bcb61987fb Fix xdemos build on FreeBSD: <sys/types.h> before <netinet/tcp.h> 2008-03-21 14:19:30 -07:00
Brian Paul 74525d474c mesa: minor code re-org 2008-03-21 11:06:52 -06:00
Brian Paul ba31cf6855 better text labels 2008-03-19 17:15:14 -06:00
Brian Paul 5456f4f210 mesa: new mipmap generation, lod bias demo
Show each of the mipmap levels side-by-side.
Press 's' to toggle quad scaling to see mipmap level at actual size.
2008-03-17 16:03:06 -06:00
Brian Paul 14150bc856 mesa: call glColorMask(1,1,1,1) before glClear()
Without this, second and subsequent redraws rendered incorrectly.
Plus comments.
2008-03-14 11:35:57 -06:00
Dan Nicholson f1e1267372 Fix include path for rain demo so glut.h is found 2008-03-11 06:24:56 -07:00
Jeremy Huddleston 7c7fece977 Darwin: Config/source fixes to now build glxdemo apps and OSMesa
Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config
(cherry picked from commit 7120c0089d663a2b7e7b0c97da38f9bc233fbdd7)
2008-03-10 15:21:39 -07:00
Dan Nicholson ab5750f143 Ignore more demo programs 2008-03-10 12:36:10 -07:00
Kristian Høgsberg 51cd168da4 glxgears: oops, remove accidental commit of glFinish() hack. 2008-02-29 15:33:40 -05:00
Kristian Høgsberg 6cb3f5c4d8 Use __DRIextension mechanism providing loader functionality to the driver.
Instead of passing in a fixed struct, the loader now passes in a list
of __DRIextension structs, to advertise the functionality it can provide
to the driver.  Each extension is individually versioned and can be
extended or phased out as the interface develops.
2008-02-29 15:05:39 -05:00
Brian 370eca12ad Added calibrate_rast.c program
Measures rasterization of points/lines/tris and suggests fixes/biases when
something doesn't meet spec.
2008-02-28 17:55:26 -07:00
José Fonseca 60159c1b09 Convert crlf->lf line endings.
Windows/DOS users should enable core.autocrlf from now on:

  git config --global core.autocrlf true
2008-02-28 16:34:32 +09:00
José Fonseca 2573f0e5d6 Convert crlf->lf line endings.
Windows/DOS users should enable core.autocrlf from now on.
2008-02-28 15:53:13 +09:00
Brian bc3f2c908e Added line smooth test 2008-02-25 16:26:37 -07:00
José Fonseca 2d38d1b300 Remove files of unsupported build systems. 2008-02-25 17:11:28 +09:00
José Fonseca 9bcc8ad0ca Update git ignores. 2008-02-25 17:05:15 +09:00
Brian 52e4c8d702 Test calling glTexSubImage2D mid-way through a frame. 2008-02-20 11:58:33 -07:00
Dan Nicholson 8c8107118e Ignore glxgears_pixmap 2008-02-17 19:34:48 -08:00
Brian f9973b1c3d Added minmag.c test
Test that different minification and magnification filters are chosen for the
non-mipmapped texture case.
2008-02-16 10:05:24 -07:00
Brian 3955bbc303 Added minmag.c test
Test that different minification and magnification filters are chosen for the
non-mipmapped texture case.
2008-02-16 09:57:50 -07:00
Adam Jackson 4955325ae9 chmod a-x **/glslnoise.c 2008-02-15 15:05:42 -05:00
Kristian Høgsberg 5961ed5fbc Add GLXPixmap version of glxgears to show case new GLX Pixmap functionality. 2008-02-14 22:05:55 -05:00
Brian ca2f2c7664 gallium: new pgon-mode.c test
A two-triangle strip is drawn such that the first tri is front-facing and
the second tri is back-facing.  Use different front/back polygon modes.
2008-02-14 18:59:24 -07:00
Brian be54b492d9 Fix broken test.
As-is, if the texture was too large for the target, an assertion would fail.
Now check proxy texture first and if it works, then test non-proxy target.
2008-02-12 16:57:00 -07:00
Brian 22ab7fa466 Fix broken test.
As-is, if the texture was too large for the target, an assertion would fail.
Now check proxy texture first and if it works, then test non-proxy target.
2008-02-12 16:56:18 -07:00
Brian cf94941122 Set Min/MaxLod with glTexParameterf, not glTexParameteri 2008-02-12 15:54:15 -07:00
Brian edc7cfa6e6 Set Min/MaxLod with glTexParameterf, not glTexParameteri 2008-02-12 15:53:37 -07:00
Brian 4697cee78b press 0,1,2,etc keys for specific bias values 2008-02-12 15:01:44 -07:00
Brian 74c32ee6aa tweak incr/decrements amounts for keyboard options 2008-02-12 15:01:32 -07:00
Brian fb3ca7ee2d tweak incr/decrements amounts for keyboard options 2008-02-12 15:00:14 -07:00
Brian 76295f0c31 press 0,1,2,etc keys for specific bias values 2008-02-12 15:00:14 -07:00
Eric Anholt 745df749cc Include glext.h in the cva test so that it actually uses CVAs. 2008-02-04 18:24:16 -08:00
Brian bd299093ec push out far clip plane to 200 2008-01-28 12:42:37 -07:00
Brian f09b2382e9 push out far clip plane to 200 2008-01-28 12:41:47 -07:00
Brian ba083bae69 Added d/D keys to change viewing distance, 'a' to toggle animation 2008-01-28 12:37:35 -07:00
Brian e7007c6fb0 Added d/D keys to change viewing distance, 'a' to toggle animation 2008-01-28 12:36:01 -07:00
Adam Jackson e1ae5b89fc glxinfo: Fix multisample visual reporting.
strstr() == 0 tests for the string _not_ being present.  Originally
Red Hat bug #351871.
2008-01-22 14:57:20 -05:00
Brian 6bd32cbcf3 Don't build yuvrect_client by default
Added 'extra' rule to build optional yuvrect_client, shape, xdemo programs
2008-01-22 07:57:33 -07:00
Brian 60dd3b1d9a remove unused var 2008-01-22 07:57:33 -07:00
Alexey Sokolov e58c365cda define M_PI if needed 2008-01-22 07:57:33 -07:00
José Fonseca e122a8fa18 gallium: Ignore generated files. 2008-01-17 12:05:37 +09:00
Brian 6c0fc07d71 fix glUniform4f typo 2008-01-01 10:20:56 -07:00
Bruce Merry 2bf2a8cc6d Convert to 0/1 when setting boolean uniforms
Also add some extra tests to the shader_api regression tests
2008-01-01 09:58:15 -07:00
Bruce Merry 239be839be Add a test program to test for assorted bugs in shader_api.c 2008-01-01 09:58:15 -07:00
Keith Whitwell ded6ce2bd5 vp-tri: match vertex/color data of other tests 2007-12-19 15:13:20 +00:00
Keith Whitwell 2c8e50c0cb use a depth buffer temporarily 2007-12-19 13:13:53 +00:00
Brian 88f1419f96 added glSecondaryColor3fv_func 2007-12-18 16:30:42 -07:00
Brian 83af4f3623 added two-side test 2007-12-18 16:25:48 -07:00
Brian 87002aba3b Test GL_VERTEX_PROGRAM_TWO_SIDE and frag shader gl_FrontFacing features 2007-12-18 16:24:19 -07:00
Brian caec2a79e6 added twoside demo 2007-12-18 16:24:19 -07:00
Brian 85f5e6d7b9 Fix a quadstrip front/back-face inconsistancy.
Only set front material colors to make it noticable if front/back-face
determination is incorrect anywhere.
2007-12-18 16:24:19 -07:00
Zack Rusin 55c1894d0a Add the new test program for fp's. 2007-12-17 13:23:47 -05:00
Brian a5eb9e7b1b Build rain demo (Gonzo <andreas.wendleder@gmail.com>) 2007-12-14 14:35:18 -07:00
Zack Rusin 6f111e9c81 Don't generate spurious vs, move the enable a bit to do that. 2007-12-13 10:31:39 -05:00
Zack Rusin 63a9d835ce Redo the fragment program examples to match vp's
we just load text files instead of compiling tons of small
binaries
2007-12-11 09:49:34 -05:00
Zack Rusin 025b140b2f Add a simple fps counter to the example 2007-12-11 09:49:33 -05:00
Roland Scheidegger 46c405663b add simple test for two-sided stencil functionality 2007-12-11 15:38:34 +01:00
Brian aef25b1994 set window size to 256x256 2007-12-10 17:32:43 -07:00
Keith Whitwell b1399a5dd2 gallium: more trivial tests 2007-12-09 14:06:00 +00:00
Keith Whitwell 56bc8d9199 gallium: remove unneeded depth buffer 2007-12-09 14:05:12 +00:00
Dan Nicholson f1efacb92b Make osdemos linking like other programs
Most of the programs list their dependencies on the Mesa libraries in
their Makefiles. This works with the default configuration where
APP_LIB_DEPS only lists external libraries. This changes the
linux-osmesa configs and the osdemos Makefile to follow that convention.

Some cleanup of the Makefile is also added to refer to the GL libraries
through the existing variables rather than hardcoding their names.
2007-12-07 14:10:27 -08:00
Brian 5b91ee27c0 Undo changes made to the toyball shaders in commit d19d0596da
This demo produces the expected results again.
2007-12-04 18:44:40 -07:00
Brian df198d24bc added culling/wireframe options 2007-12-04 14:07:08 -07:00
Brian 44c8dac0af better front-plane clip test 2007-11-30 09:08:58 -07:00
joukj a11b6f025c Updates of some OpenVMS makefiles. 2007-11-30 13:16:05 +01:00
Brian 92e4090b4c add a few more logicop modes, simplify code 2007-11-27 10:31:55 -07:00
Brian be1fa5b3d7 better test of point attenuation 2007-11-23 16:19:25 -07:00
Brian 88b067cb04 #define GL_GLEXT_PROTOTYPES to silence warning 2007-11-23 14:35:46 -07:00
Brian ccb1c9df00 Print point/line size range limits 2007-11-22 09:34:38 -07:00
Brian 8211b20026 added z/s keys to reset/step rotation 2007-11-16 15:19:05 -07:00
Brian fb69fe58a0 Only emit texcoords for enabled units. Enable/disable units with 0..7 keys.
Also, asst. clean-ups.
2007-11-16 15:19:05 -07:00
Brian f6ab1347d6 remove dependency on libGLU 2007-11-12 08:02:09 -07:00
Brian 578641941f test that point/line/quad rendering hits the right pixels 2007-11-09 17:02:51 -07:00
Brian 8b8a970593 test glStencilFuncSeparateATI() 2007-10-30 10:23:58 -06:00
Michal Krol 918ea5168b Rename 'mms-config.' to 'mms.config'.
It looks like Windows does not like filenames ending with a dot,
in effect renaming it to 'mms-config'.
2007-10-29 19:50:10 +00:00
Dan Nicholson c05aa5ec4c specify app lib dependencies in Makefiles (patch 1/3) 2007-10-29 09:03:01 -06:00
michal a1b4285c5c Fix fragment shader. 2007-10-27 19:04:19 +01:00
michal 9c22f91030 Optimize fragment program. 2007-10-27 19:04:19 +01:00
Zou Nan hai 6ef27b88e6 Merge branch '965-glsl'
Conflicts:

	src/mesa/drivers/dri/i965/brw_sf.h
	src/mesa/drivers/dri/i965/intel_context.c
2007-10-26 15:39:50 +08:00
José Fonseca 414a933ad2 Ignore generated files. 2007-10-25 23:25:02 +01:00
Dan Nicholson 8578534f48 Ignore new programs 2007-10-25 11:34:16 -07:00
Zack Rusin 4a4e6f2cab Implement loops 2007-10-25 11:47:25 -04:00
Zack Rusin 1d26e9c447 Fix nested conditionals 2007-10-25 09:04:41 -04:00
Zack Rusin e842b5e5ba Test some functionality of vp using GLSL that pure vp isn't testing. 2007-10-25 09:04:41 -04:00
Brian 55d4f32fc2 fix assorted bugs, works now 2007-10-24 13:55:22 -06:00
Kristian Høgsberg a074857cdc glxinfo: Try creating a GLX context using an fbconfig if no visuals are available. 2007-10-18 15:19:38 -04:00
Ian Romanick b961eccc92 Support cards that have ARB_fp but not ARB_shadow. 2007-10-17 16:25:39 -07:00
Kristian Høgsberg aad5c0fdc7 pbutil: Do not require GLX_SGIX_pbuffer for fbconfig only-functions. 2007-10-17 17:04:59 -04:00
Kristian Høgsberg a5b4bb393f glxinfo: Also print number of fbconfigs. 2007-10-17 15:06:11 -04:00
Kristian Høgsberg 87966baa8d Fixup a couple of thinkos in glxinfo changes. 2007-10-17 10:15:10 -04:00
Kristian Høgsberg 791ad0e77f Implement support for printing glx fbconfigs in glxinfo. 2007-10-16 16:07:52 -04:00
Kristian Høgsberg f7d1d554b1 glxinfo: Only print visuals that actually support GLX. 2007-10-16 16:07:52 -04:00
Kristian Høgsberg c095f7e46a Do XSync() before resetting error handler. 2007-10-13 18:46:01 -04:00
Brian 72c888869f Example of cooperative rendering into one window by two processes 2007-10-11 18:25:12 -06:00
Brian f1104b079f New glxsnoop demo to display another window's z/stencil/back buffer. 2007-10-11 16:39:02 -06:00
Brian 03ff9c96bf replace 'brick' with correct program name in printfs 2007-10-10 10:56:48 -06:00
Dan Nicholson b182613f2f Ignore more generated files in progs/
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
2007-10-10 08:44:58 -06:00
Brian 2727cfddbf hack in some code to test loops, break 2007-09-29 10:44:05 -06:00
Brian 9405ec6251 temporary hack to test nested conditionals 2007-09-28 21:04:56 -06:00
Dan Nicholson 2a3e33865d add support for LDFLAGS env var 2007-09-28 18:42:21 -06:00
Eric Anholt 56af8fd00f Fix progs/tests/ build with BSD make. 2007-09-24 10:26:56 -07:00
Eric Anholt b74140db66 Update .gitignore for tests and xdemos. 2007-09-24 10:26:40 -07:00
Eric Anholt 9bb0d628b8 Just use stddef.h to get ptrdiff_t instead of obsolete malloc.h. 2007-09-24 10:22:31 -07:00
Eric Anholt 45899a494c Update .gitignore for demos. 2007-09-19 10:51:07 -07:00
Brian 6fbbeed690 use perspective projection, press r/R to rotate the quad 2007-09-18 12:56:23 -06:00
Brian bb4a9b2dce added copypix.c test (test glCopyPixels w/ pixel zoom) 2007-09-14 09:59:08 -06:00
Brian 24cd84162e clean-up (see bug 12317) 2007-09-10 08:37:09 -06:00
Brian 050837045f more usage info 2007-08-30 14:44:40 -06:00
Brian f726ffd060 test flat shading w/ clipping 2007-08-30 14:43:59 -06:00
Brian 3a484cd794 added --noclear option to demonstrate rendering without glClear 2007-08-27 12:00:19 -06:00
Brian bfcc337e38 vars to test 1D/2D textures with linear/nearest filtering 2007-08-14 15:19:37 -06:00
Xiang, Haihao 5dab3bf4bc xdemo case: Wei Wang's patch for bug#9759 2007-08-14 11:39:23 +08:00
Brian 9f51e181b1 added pixelzoom cmd line opt 2007-08-13 18:20:04 -06:00
Brian b7693ee559 Draw white square in lower-left corner to test orientation 2007-08-13 14:00:03 -06:00
Brian 34d535ad2c glRead/DrawPixels test 2007-08-10 13:06:07 -06:00
Brian c7157065b2 change triangle orientation, fix exit() 2007-08-10 08:33:09 +01:00