Commit Graph

1698 Commits

Author SHA1 Message Date
Brian Paul ae99e4c67e progs/glsl: new shtest program, a simple shader test harness app
This commit includes some sample config files (*.shtest)
2009-08-13 12:52:13 -06:00
Brian Paul fdfb0d4b0e progs/glsl: change uniform_info::type field to use GLSL vector types 2009-08-12 17:28:45 -06:00
Brian Paul af3d7f6889 demos: call SetUniformValues() 2009-08-12 17:28:45 -06:00
Brian Paul 684049d97d demos: rename InitUniforms() to SetUniformValues()
And call new PrintUniforms() in demos.
2009-08-12 17:28:45 -06:00
Brian Paul 378bff0edd progs/util: added more shader utility functions 2009-08-12 17:28:45 -06:00
Eric Anholt 74504c48ad demos: Fix the VBO usage in glsl/multitex.
The fix for 965 to be noisy when apps sent pointers instead of VBO offsets
caught this app in the act of doing exactly that.

Bug #23203
2009-08-10 15:53:47 -07:00
Robert Ellison 2caec748ad tests: have getprocaddress return a return code
These minor changes allow getprocaddress to return an error code
in the case of test failure.  This allows the program to be integrated
into the piglit test suite.
2009-08-07 12:23:19 -06:00
Robert Ellison 99d5139078 mesa: improve getprocaddress test
- Allow the getprocaddress test to test extensions not supported by
  Mesa.  The original getprocaddress.py script only included OpenGL
  extension functions that were in Mesa dispatch tables.  Now all
  known extension functions (as detailed in gl_API.xml) are included.
  As the test does not link against any extension function symbols
  (i.e. it uses glXGetProcAddress() for all extension functions),
  it still compiles and links against Mesa; but now the same
  binary can be used to test extensions not yet supported by Mesa.

- Extend the list of tested extension functions.  The last revision
  of this test exercised 16 extension functions; this revision adds
  support for 95 more.
2009-08-07 12:06:17 -06:00
Brian Paul c02b38d169 progs/xdemos: added multictx.c (multi-context rendering demo)
Create one window and render into it with two GLX contexts.  Setup the
rendering state differently for each context to be sure there's no state
"bleeding" between contexts.
2009-08-07 09:52:18 -06:00
Brian Paul 84e67330e1 glxgears: make functions static, update comments 2009-08-07 09:50:38 -06:00
Chia-I Wu e179ab2815 progs/egl: Add xeglbindtex, really.
Missed this file in the earlier commit.
2009-08-06 08:40:03 -06:00
Chia-I Wu 246f58d922 progs/egl: Add xeglbindtex.
This is a simple demo for eglBindTexImage.  It uses a OpenGL context,
instead of the required OpenGL ES one.  But it still suffices the demo
and test purpose.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-08-05 16:08:48 -06:00
Brian Paul 1f71305993 Merge branch 'mesa_7_5_branch'
Conflicts:

	src/mesa/main/state.c
2009-08-05 14:13:48 -06:00
Roland Scheidegger 0abc9e7565 tests: also test xoffset in texcompsub test
use glCompressedTexSubImage2DARB also with xoffset by splitting into 3 calls
in total. Dunno if the top/bottom reversal is intentional but leave as is.
2009-08-05 01:13:21 +02:00
Brian Paul cd7a8225e8 tests/getteximage: test more texture sizes, including npot 2009-08-04 16:17:09 -06:00
Pauli Nieminen fb7cf731f9 xdemo/glxswapcontrol: Move get_framge_usage after the swap.
This fixes the problem that first frame would report bogus usage values.
Problem was caused because get_frame_usage returned data from previous buffer
swap.

Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
2009-08-03 13:42:05 -06:00
Pauli Nieminen b59eb3b8b1 xdemos/glxcontexts: Don't leak visual info when choosing visual again.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
2009-08-03 11:55:29 -06:00
Ian Romanick 9f26f801dc progs/vp: Correct the PARAM array sizes in arl-*.txt 2009-07-30 14:08:53 -07:00
Brian Paul 783a93a2c3 tests: glGetTexImage() test 2009-07-30 09:46:57 -06:00
Brian Paul d2f6d6ce49 Merge branch 'mesa_7_5_branch'
Conflicts:

	Makefile
	configs/default
	docs/relnotes.html
	src/mesa/main/version.h
2009-07-28 08:58:25 -06:00
Vinson Lee bc60b88411 progs/trivial: add missing files to Makefile, .gitignore 2009-07-28 08:54:48 -06:00
Brian Paul b96ae1b2c4 Merge branch 'mesa_7_5_branch'
Conflicts:

	Makefile
	progs/glsl/multitex.c
	src/mesa/main/enums.c
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/version.h
2009-07-17 22:00:47 -06:00
Brian Paul cd10996d4f progs/util: remove extfuncs.h (we use GLEW instead) 2009-07-17 14:43:29 -06:00
Brian Paul ee0b1bc7d3 progs/glsl: finish conversion to GLEW
This is a follow-on to b799af91d5.
Remove _func function suffix and unneeded #includes.
2009-07-17 13:23:11 -06:00
Chia-I Wu 30bccf8ea9 xeglthreads: Check current context for EGL per-thread support.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-07-17 11:56:32 -06:00
Chia-I Wu 721f80b82a egl: Add xeglthreads
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-07-16 08:29:57 -06:00
Jakob Bornecrantz 26e58a42b0 progs/tests: Use compressed texture in mipmap_comp_tests 2009-07-14 17:11:07 +01:00
Jakob Bornecrantz b0a17581e2 progs/tests: Tests more views in mipmap_comp_tests 2009-07-14 17:11:05 +01:00
Jakob Bornecrantz a36b9987cd progs/tests: Add yet another mipmap test 2009-07-14 17:11:01 +01:00
Brian Paul 9615daa932 Merge branch 'mesa_7_5_branch' 2009-07-13 08:47:37 -06:00
Brian Paul 6ff1a5385e demos: set 4th component of texcoord to 1.0
Avoid potential randomness in resulting texcoords.
2009-07-10 13:09:09 -06:00
Ian Romanick 7fb4becf98 demos: Fix vsync checking in glxgears
Of course glXGetVideoSyncSGI doesn't return the swap interval.  The feature
only exists in the Mesa extension... which is the whole reason I created the
Mesa extension!  Note that the Mesa extension allows drivers to default to a
swap interval of 0.  If the Mesa extension exists, use its value.  Only
consider the SGI extension when the Mesa extension is not available.

Fixes bug #22604.
2009-07-06 11:42:12 -07:00
Brian Paul f742f2c0b3 demos: indentation fix 2009-07-08 13:59:03 -06:00
Brian Paul 820436f978 demos: use glEnable/DisableClientState() for vertex arrays 2009-07-08 13:58:30 -06:00
Jakob Bornecrantz eb33c0ab8b progs/tests: Use compressed texture in mipmap_comp_tests 2009-07-04 16:01:45 +02:00
Jakob Bornecrantz 28471cfa97 Merge branch 'mesa_7_5_branch' 2009-07-04 07:43:01 +02:00
Jakob Bornecrantz 9982821cda progs/tests: Tests more views in mipmap_comp_tests 2009-07-04 07:41:40 +02:00
Zack Rusin edb0267170 Merge commit 'origin/openvg-1.0' 2009-07-06 21:43:26 -04:00
Jakob Bornecrantz 862488075c Merge branch 'mesa_7_5_branch'
Conflicts:
	src/mesa/main/dlist.c
	src/mesa/vbo/vbo_save_api.c
2009-07-03 18:53:58 +02:00
Keith Whitwell f580494bef progs: revert damage to progs/SConscript from recent compressed texture commit 2009-07-03 16:40:03 +01:00
Keith Whitwell 1668a679c4 Merge commit 'origin/dlist-statechange-shortcircuit' into mesa_7_5_branch
Conflicts:
	progs/trivial/Makefile

Pull in a minimal version of statechange shortcircuiting in display
list compilation.  This affects only glMaterial and glShadeModel state,
and includes quite a few tests to exercise various tricky cases.

If this goes well, will consider extending to all state in the future.
2009-07-02 13:29:46 +01:00
Ian Romanick f359165a82 demos: Set the depth mask correctly to get the desired blending 2009-06-30 17:29:52 -07:00
Keith Whitwell 1fa4cde757 mesa/vbo: fix compile and replay of nodes ending in a FALLBACK
Where vbo save nodes are terminated with a call to DO_FALLBACK(), as in
the case of a recursive CallList which is itself within a Begin/End pair,
there two problems:
1) The display list node's primitive information was incorrect, stating
the cut-off prim had zero vertices
2) On replay, we would get confused by a primitive that started in a
node, but was terminated by individual opcodes.

This change fixes the first problem by correctly terminating the last
primitive on fallback, and the second by forcing the display list to
use the Loopback path, converting all nodes into immediate-mode rendering.

The loopback fix is a performance hit, but avoiding this would require
a fairly large rework of this code.
2009-06-30 19:52:44 +01:00
Keith Whitwell c48c01c9e7 progs/trivial: add dlist-mat-tri.c 2009-06-30 18:37:34 +01:00
Keith Whitwell 1ca836f0de progs/trivial: add test case for short-circuiting material changes
Similar to dlist-tri-flat-tri, but using glMaterial calls, which
have the extra property of being legal within Begin/End calls.
2009-06-30 18:17:39 +01:00
Keith Whitwell 09a3a28fc8 progs/trivial: add dlist-flat-tri.c
State-change functions which precede the first call to glEnd() in
a compiled list are vulnerable to not being executed when that list
is called.

In particular this can happen if a list is invoked from within a
begin/end pair, as in this example.
2009-06-30 17:06:50 +01:00
Keith Whitwell 2e570be852 progs/trivial: add dlist-recursive-call
When one display list calls another display list, it is possible
that the calling display list makes state-changes or other actions which
invalidate any attempt at caching or state-change elimination in the
calling list.

This test exercises one such case, where the called list consists of just
a single glShadeModel() call.
2009-06-30 17:02:16 +01:00
Keith Whitwell 1730eaa2a2 dlist-tri-flat-tri: make tri render differently if flatshade not enabled
When testing flat-shading, it helps to specify per-vertex colors so
that you can distinguish between flat & smooth shading.
2009-06-30 16:57:21 +01:00
Keith Whitwell 4147bb24d4 Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit
Need this to pick up fixes for per-vertex materials.
2009-06-30 16:28:54 +01:00
Keith Whitwell 6af783bea0 progs/trivial: add test case for lighting plus per-vertex materials
Exercise material-within-begin/end case.
2009-06-30 16:19:23 +01:00
Keith Whitwell a9ae89d104 progs/isosurf: add materials mode for glVertex + TRISTRIP 2009-06-30 16:14:08 +01:00
Brian Paul b40dc7e7fc Merge branch 'mesa_7_5_branch'
Conflicts:

	src/mesa/vbo/vbo_exec_draw.c
2009-06-30 08:56:53 -06:00
Keith Whitwell 14a2b5445a progs/util: make sure function pointers are initialized
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
2009-06-30 15:41:43 +01:00
Jakob Bornecrantz ba7f45ac0c progs/tests: Add tests for glCompressedTexSubImage 2009-06-30 14:11:29 +02:00
Jon TURNEY 57955451f8 xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAY
Fix xdemos which default to using display :0.0 to default to $DISPLAY,
this is kind of irritating when testing on a display other than :0.0

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-06-30 13:58:21 -06:00
Keith Whitwell e5cb11adda mesa/vbo: fix compile and replay of nodes ending in a FALLBACK
Where vbo save nodes are terminated with a call to DO_FALLBACK(), as in
the case of a recursive CallList which is itself within a Begin/End pair,
there two problems:
1) The display list node's primitive information was incorrect, stating
the cut-off prim had zero vertices
2) On replay, we would get confused by a primitive that started in a
node, but was terminated by individual opcodes.

This change fixes the first problem by correctly terminating the last
primitive on fallback, and the second by forcing the display list to
use the Loopback path, converting all nodes into immediate-mode rendering.

The loopback fix is a performance hit, but avoiding this would require
a fairly large rework of this code.
2009-06-30 19:59:38 +01:00
Keith Whitwell 53f8dccd0c progs/trivial: test case for dlist statechange elimination
Creates a display list with redundant call to glShadeModel.

View dlist contents with MESA_VERBOSE=list
2009-06-30 12:20:24 +01:00
Brian Paul 8d24160a40 progs/glsl: link with GLEW library
(cherry picked from commit b1f2f92d9b)
2009-06-30 11:47:51 +01:00
Brian Paul 7b5373c434 Merge branch 'mesa_7_5_branch' 2009-06-29 11:20:07 -06:00
Brian Paul b1f2f92d9b progs/glsl: link with GLEW library 2009-06-29 10:32:04 -06:00
Keith Whitwell 9014f475ff progs/util: make sure function pointers are initialized
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
2009-06-29 16:07:14 +01:00
Keith Whitwell b799af91d5 progs/glsl: compile with scons and glew
Get most of these working with scons.
2009-06-29 14:15:08 +01:00
Brian Paul eb1eee03a6 demos: improve argv parsing in fslight.c 2009-06-26 13:16:32 -06:00
Brian Paul b79e6a59d8 demos: fix issues in glxcontexts.c
The reshape() function was called when there was no GLX context so
the viewport/modelview/projection setup wasn't doing anything.  Move
the call to reshape() into draw().

Also, remove -stereo, -fullscreen options and do some general clean-up.
2009-06-23 09:31:27 -06:00
José Fonseca 1bee650ef3 progs/wgl: Fix shreadtex_mt too. 2009-06-17 15:23:25 +01:00
José Fonseca 6e24fdeae5 progs/wgl: Tweak the initialization wait in wglthreads.
There was still a non-zero probability for wglShareLists of failing.
2009-06-17 15:23:25 +01:00
José Fonseca 557421b6de progs/wgl: Get wglShareLists working in wglthreads.
wglShareLists is a little picky -- it seems to check if it has exclusive
access to a lock, and fails if it doesn't.

This allows the texture to be shared with all windows.
2009-06-17 15:23:25 +01:00
José Fonseca 992000cce7 progs/wgl: Allow resizing wglthreads' windows. 2009-06-17 10:08:24 +01:00
José Fonseca 077c5e62d8 progs/wgl: Quit after displaying usage for -h option. 2009-06-16 12:34:29 +01:00
José Fonseca 06075711af progs/wgl: Use appropriate types to silence msvc warnings. 2009-06-16 12:29:58 +01:00
José Fonseca 566bdbe67d progs/wgl: Fix assertion failure in wglthreads' texture creation. 2009-06-16 12:29:58 +01:00
José Fonseca 0e1abced56 progs/tests: Use opaque colors.
Transparency is not relevant for this example, and leads to distraction
due to different results in alpha visuals, when capturing images to disk.
2009-06-15 15:40:10 +01:00
Jakob Bornecrantz 2fe65e8f14 Merge branch 'mesa_7_5_branch' 2009-06-14 16:56:34 +02:00
Brian Paul f57280cc73 Merge branch 'arb_vertex_array_object' 2009-06-26 17:49:14 -06:00
Brian Paul a18e209edb Merge branch 'mesa_7_5_branch'
Conflicts:

	Makefile
	src/gallium/drivers/softpipe/sp_screen.c
	src/mesa/main/version.h
2009-06-26 17:07:07 -06:00
Brian Paul 31618f1a88 tests: update bufferobj.c to test GL_ARB_vertex_array_object 2009-06-22 17:51:30 -06:00
Brian Paul 9038b6c8bb Merge branch 'ext-provoking-vertex'
Conflicts:

	docs/relnotes-7.6.html
	progs/tests/Makefile
	src/gallium/drivers/softpipe/sp_prim_vbuf.c
	src/glx/x11/indirect.c
	src/mesa/glapi/Makefile
	src/mesa/glapi/dispatch.h
	src/mesa/glapi/glapioffsets.h
	src/mesa/glapi/glapitable.h
	src/mesa/glapi/glapitemp.h
	src/mesa/glapi/glprocs.h
	src/mesa/main/dlist.c
	src/mesa/main/enums.c
	src/mesa/sparc/glapi_sparc.S
	src/mesa/x86-64/glapi_x86-64.S
	src/mesa/x86/glapi_x86.S
2009-06-19 09:15:34 -06:00
Jakob Bornecrantz edbec6b112 progs/rbug: Add small program to add block rules 2009-06-18 14:36:19 +02:00
Brian Paul 8d48222791 Merge branch 'mesa_7_5_branch'
Conflicts:

	src/mesa/main/api_validate.c
2009-06-16 18:25:52 -06:00
Thomas Hellstrom f5888d9ca5 Merge branch 'mesa_7_5_branch'
Conflicts:

	progs/util/extfuncs.h
2009-06-15 11:43:48 +02:00
Jakob Bornecrantz e99d13bbc6 progs/tests: Add yet another mipmap test 2009-06-14 01:44:34 +02:00
Brian Paul a04af335a4 Merge branch 'mesa_7_5_branch'
Conflicts:

	src/mesa/drivers/dri/i915/i915_tex_layout.c
	src/mesa/drivers/dri/i965/brw_wm_glsl.c
	src/mesa/drivers/dri/intel/intel_buffer_objects.c
	src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
	src/mesa/drivers/dri/intel/intel_pixel_draw.c
	src/mesa/main/enums.c
	src/mesa/main/texstate.c
	src/mesa/vbo/vbo_exec_array.c
2009-06-24 08:54:37 -06:00
Roland Scheidegger 7a5c5b9af3 demos: make cubemap work without EXT_fbo support
use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation)
is not available.
2009-06-20 00:28:38 +02:00
Brian Paul 193177b732 tests: added persp_hint.c test
Test the effect of GL_PERSPECTIVE_CORRECTION_HINT on color interpolation.
2009-06-12 15:59:53 -06:00
Brian Paul 5379f35a15 tests: added arbgpuprog, for compile-testing ARB vertex/fragment programs 2009-06-12 08:16:18 -06:00
Brian Paul fb64365642 demos: update fbotexture.c to use EXT or ARB functions exclusively
When the -arb option is specified we use GL_ARB_framebuffer_object intead
of GL_EXT_framebuffer_object.

For some vendors' OpenGL it's important to call the ARB entrypoints
instead of the EXT entrypoints to get correct behaviour.  Use some
function pointer tricks to do this (instead of GLEW).
2009-06-12 08:15:33 -06:00
Brian Paul 476685c63c util: additional function pointers 2009-06-12 08:15:33 -06:00
Jakob Bornecrantz 1cd0afffc9 progs/rbug: Add binary to bmp converter program 2009-06-12 15:07:57 +01:00
José Fonseca bf89ecb6c9 Merge branch 'mesa_7_5_branch'
Conflicts:
	src/mesa/state_tracker/st_cb_fbo.c
	src/mesa/state_tracker/st_framebuffer.c
2009-06-11 16:34:56 +01:00
José Fonseca e3f14f2f3b progs: Port fp programs to GLEW. 2009-06-11 13:19:34 +01:00
Brian Paul 0195cc1c0d tests: prim.c demo, modified for GL_EXT_provoking_vertex 2009-06-09 22:00:22 -06:00
Brian Paul 39fd18014c tests: need tkmap.c for prim.c 2009-06-09 21:59:36 -06:00
Jakob Bornecrantz ee98ae5a29 Merge branch 'mesa_7_5_branch'
Conflicts:

	Makefile
	src/mesa/main/version.h
	src/mesa/shader/slang/slang_preprocess.c
	src/mesa/state_tracker/st_cb_bufferobjects.c
2009-06-09 07:53:25 +02:00
Brian Paul 29c79a03a4 tests: check for GL_EXT/ARB_framebuffer_object 2009-06-09 15:06:41 -06:00
Brian Paul 073c20befa tests: also test glGetTexImage with render to texture
Also, adjust texture dims for the original test.
And use GLEW.
2009-06-09 15:05:36 -06:00
Brian Paul 139f2ddde4 tests: quick and dirty glGetTexImage() test program 2009-06-09 14:05:17 -06:00
Jakob Bornecrantz 283e84bfb3 progs/tests: Add some scissor tests 2009-06-08 14:45:40 +02:00
Brian Paul 9d58724c51 Merge branch 'mesa_7_5_branch'
Conflicts:

	src/mesa/main/context.c
2009-06-04 13:16:13 -06:00
Keith Whitwell 97f5953ced progs/vpglsl: add similar support for point rendering as progs/vp 2009-06-01 18:40:21 -07:00
Keith Whitwell 00e7a60077 trivial/tri-z: add controls for depthrange min/max
Also add key to set up quake-1 style ztrick rendering with clear depth
1.0, deptrange(1.0, 0.0) and depthfunc GL_GREATER.
2009-06-01 18:39:58 -07:00
José Fonseca 3c756ed39f progs/wgl: Small cleanup to wglinfo. 2009-06-01 18:23:20 -07:00
José Fonseca 76ad2b4a5a progs/wgl: Use an invisible window in wglinfo. 2009-06-01 18:23:20 -07:00
Brian Paul 9f6ec50f8c Merge branch 'mesa_7_5_branch' 2009-06-01 15:01:33 -06:00
Brian Paul a5d033e89b demos: add missing dependencies for util files 2009-06-01 11:23:39 -06:00
Jakob Bornecrantz 85e0572756 progs/rbug: Add small remote debugging cli applications 2009-06-01 11:39:25 +01:00
Brian Paul 5be48307d5 demos: remove some old debug/test code 2009-05-27 19:37:32 -06:00
Brian Paul 891a2bdd7d demos: extend glsl/multitex.c to use a vertex buffer object 2009-05-22 13:12:28 -06:00
Brian Paul 96370113f1 demos/util: add funcs for GL_ARB_buffer_object 2009-05-22 13:12:01 -06:00
Brian Paul 58fadc6242 demos: fix multitex.c VertCoord attribute mapping
If the multitex.vert shader uses the VertCoord generic vertex attribute
instead of the pre-defined gl_Vertex attribute, we need to make sure that
VertCoord gets bound to generic vertex attribute zero.

That's because we need to call glVertexAttrib2fv(0, xy) after all the other
vertex attributes have been set since setting generic attribute 0 triggers
vertex submission.  Before, we wound up issuing the vertex attributes in
the order 0, 1, 2 which caused the first vertex to be submitted before all
the attributes were set.  Now, the attributes are set in 1, 2, 0 order.
2009-05-22 13:00:49 -06:00
Joakim Sindholt 723bc9452f progs/trivial: update .gitignore with new binaries 2009-05-12 21:00:39 +02:00
Brian Paul e7cb125b2d Merge branch 'mesa_7_5_branch'
Conflicts:

	Makefile
	src/mesa/main/version.h
2009-05-11 16:27:50 -06:00
Brian Paul f5cf181c65 trivial: destroy window upon exit 2009-05-11 16:08:01 -06:00
Keith Whitwell d56b0e6847 progs/trivial: add test for vertex program invarient transform 2009-05-08 14:57:28 +01:00
Keith Whitwell e99729d63d progs/trivial: add vbo-noninterleaved test 2009-05-08 14:57:27 +01:00
Keith Whitwell 482be01db0 trivial: add line-flat.c 2009-05-08 14:57:26 +01:00
Brian Paul 56cfa4de91 demos: delete vertex array objects upon exit 2009-05-07 14:34:09 -06:00
Keith Whitwell 077c904b76 progs/trivial: add test for vertex program invarient transform 2009-05-05 13:14:54 +01:00
Keith Whitwell 5f2569a1b9 progs/trivial: add vbo-noninterleaved test 2009-05-05 13:14:48 +01:00
Keith Whitwell 4d548bd069 trivial: add line-flat.c 2009-05-05 13:14:45 +01:00
Zack Rusin 54324d9e0c vg: remove a silly demo and add a bit better one 2009-05-01 19:08:32 -04:00
Zack Rusin 544dd4b11f OpenVG 1.0 State Tracker
Import of the OpenVG 1.0 state tracker for Gallium.
2009-05-01 12:51:59 -04:00
Brian Paul 3dfe672c85 demos: silence warning 2009-04-30 17:03:54 -06:00
Jakob Bornecrantz 289dc69418 progs/tests: Update ignores 2009-04-29 20:44:03 +01:00
Jakob Bornecrantz 1793d5adac progs/tests: Add mipmap_comp for mipmap testing with compressed textures 2009-04-29 20:18:12 +01:00
Keith Whitwell fd402791f9 progs: add fflushes for cygwin 2009-04-28 18:15:17 +01:00
Brian Paul e0d5ff1a8a demos: asst. updates, clean-ups 2009-04-28 07:31:30 -06:00
Shuang He e326600609 demos: Clean up allocated Textures and Display Lists when demo quit 2009-04-27 07:13:33 -06:00
Alan Hourihane b2a69ae879 demos: ensure display lists are destroyed for next generation 2009-04-24 16:45:36 +01:00
Keith Whitwell a86ef37655 shadowtex: fflush stdout for cygwin 2009-04-24 12:16:39 +01:00
Keith Whitwell eb5d96968f demos/readpix: add option to draw triangle instead of drawpix 2009-04-24 10:09:14 +01:00
Keith Whitwell 510a44eea7 tests/mipmap_view: add a bunch of keystrokes for testing render-to-texture
Move between mipmaps, render a triangle, reload textures with either
the original arch (and GenMipmaps) or via straightforward glTexImage.
2009-04-24 10:09:14 +01:00
Brian Paul dad1c1be18 demos: check that GL version is 2.0 or higher 2009-04-21 07:27:27 -06:00
Keith Whitwell e20f837f67 trivial/tri-viewport: add keys for frustrum/ortho and z coordinate 2009-04-21 11:40:59 +01:00
Keith Whitwell 6e05224bc4 trivial/tri-viewport: add more out-of-bounds background quads 2009-04-21 11:13:16 +01:00
Keith Whitwell a38f7d9e68 trivial/tri_viewport: add space==reset key 2009-04-21 11:13:15 +01:00
Keith Whitwell 6bfcffa79e trivial/tri_viewport: add width/height keys 2009-04-21 11:13:15 +01:00
Keith Whitwell d017749b3e mesa/progs: fix scons build after recent demo moves 2009-04-20 16:17:50 +01:00
Keith Whitwell c691f96e98 trivial/tri-viewport.c - add guide lines, more triangles, make interactive
This is becoming more like a test than a trivial/ example.
2009-04-20 16:12:11 +01:00
Keith Whitwell 70588fc83c tests/mipmap_view: add linear/nearest key 2009-04-20 16:12:11 +01:00
Jakob Bornecrantz 90a23e340f progs/demos: Update ignore 2009-04-19 16:24:29 +01:00
Jakob Bornecrantz 59c8e738c4 progs/glsl: Update ignore 2009-04-19 16:23:49 +01:00
Brian Paul c0565e86b4 demos: added glsl/texaaline.c program and overhaul the Makefile 2009-04-18 14:18:59 -06:00
Brian Paul 3595732f28 demos: updated .gitignore list 2009-04-18 13:18:44 -06:00
Brian Paul d61070b659 demos: move demos/texobj.c to tests/ 2009-04-18 13:12:50 -06:00
Brian Paul 30e80f6e55 demos: move demos/occlude.c (old HP extension) to tests 2009-04-18 13:10:51 -06:00
Brian Paul 22af013f85 demos: move tests/dinoshade.c to demos/ 2009-04-18 13:08:48 -06:00
Brian Paul 49c3e7172d demos: move tests/projtex.c to demos/
And fix compiler warnings.
2009-04-18 13:05:51 -06:00
Brian Paul 292e192093 demos: move tests/fbotexture.c to demos/ 2009-04-18 13:00:48 -06:00
Brian Paul f47495ec42 demos: move texdown.c to tests/ 2009-04-18 12:58:00 -06:00
Brian Paul dfd69a27f8 demos: move glutfx demo to tests/ 2009-04-18 12:57:13 -06:00
Brian Paul 6a495d26af demos: move streaming_rect.c demo to tests/ 2009-04-18 12:55:55 -06:00
Brian Paul 118856641f demos: move glslnoise.c demo to glsl/noise2.c 2009-04-18 12:54:27 -06:00
Brian Paul 3e750ce5c4 demos: fix incorrect assertion 2009-04-18 10:20:26 -06:00
Brian Paul 2bf326af10 demos: fix usage text 2009-04-18 10:08:15 -06:00
Brian Paul 538a823882 demos: new glsl/array.c demo
Test variable indexing into a uniform array in a vertex shader.
2009-04-17 16:23:33 -06:00
Brian Paul 90c880f089 demos: move glewInit() call, fixes crash/bug 21247 2009-04-17 09:16:48 -06:00
Brian Paul 047efcd050 demos: move glewInit() after glutCreateWindow()
Fixes segfault.  See bug 21239.  However, the demo doesn't render
properly.  Probably a bug in the GL_ATI_fragment_shader code.
2009-04-17 08:11:00 -06:00
Brian Paul 189db329ca demos: set init window size, not pos 2009-04-16 22:07:53 -06:00
Brian Paul 0d0028e6df demos: use larger buffer for snprintf() call, see bug 21220 2009-04-16 09:25:52 -06:00
José Fonseca e80d1e367a Merge branch 'gallium-s3tc' 2009-04-16 10:51:42 +01:00
Jakob Bornecrantz 82e92eeab0 progs/tests: Make texcompress2 get texture 2009-04-15 23:36:22 +02:00
Brian Paul f94053eb7d tests: another extended swizzle test 2009-04-15 19:55:28 -06:00
José Fonseca 6fc244c68d wgl: Note down the gallium pixel formats, instead of re-guessing them. 2009-04-10 19:50:35 +01:00
Brian Paul d60b4f7885 mesa: asst. progs/test/Makefile files 2009-04-10 08:54:37 -06:00
José Fonseca f8f4b03442 progs: Port glxinfo to wgl. 2009-04-10 13:26:35 +01:00
Brian Paul 08a1e1ebcb demos: fix aspect ratio in Reshape() 2009-04-09 17:04:58 -06:00
Jakob Bornecrantz 29a1ed599b progs: Ignores 2009-04-02 17:00:25 +02:00
Brian Paul f8304bf1ed demos: added progs/glsl/linktest.c to test linking of separate compilation units 2009-04-01 19:54:35 -06:00
Keith Whitwell e919bfa1f1 progs/vp: more psiz tests 2009-03-25 10:07:28 +00:00
Brian Paul c4c4358e08 demos: add LDFLAGS for corender target, bug 20844 2009-03-24 16:06:50 -06:00
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