summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_5_branch'Brian Paul2009-07-131-0/+1
|\
| * demos: set 4th component of texcoord to 1.0Brian Paul2009-07-101-0/+1
| | | | | | | | Avoid potential randomness in resulting texcoords.
* | demos: indentation fixBrian Paul2009-07-081-1/+1
| |
* | demos: use glEnable/DisableClientState() for vertex arraysBrian Paul2009-07-087-27/+27
| |
* | progs/tests: Use compressed texture in mipmap_comp_testsJakob Bornecrantz2009-07-041-1/+3
| |
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-07-041-19/+16
|\|
| * demos: Fix vsync checking in glxgearsIan Romanick2009-07-061-19/+16
| | | | | | | | | | | | | | | | | | | | 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.
* | progs/tests: Tests more views in mipmap_comp_testsJakob Bornecrantz2009-07-041-1/+4
| |
* | Merge commit 'origin/openvg-1.0'Zack Rusin2009-07-0632-0/+5178
|\ \
| * | vg: remove a silly demo and add a bit better oneZack Rusin2009-05-014-197/+544
| | |
| * | OpenVG 1.0 State TrackerZack Rusin2009-05-0131-0/+4831
| | | | | | | | | | | | Import of the OpenVG 1.0 state tracker for Gallium.
* | | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-07-0318-10/+5498
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
| * | progs: revert damage to progs/SConscript from recent compressed texture commitKeith Whitwell2009-07-031-0/+9
| | |
| * | Merge commit 'origin/dlist-statechange-shortcircuit' into mesa_7_5_branchKeith Whitwell2009-07-026-0/+893
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | mesa/vbo: fix compile and replay of nodes ending in a FALLBACKKeith Whitwell2009-06-302-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | progs/trivial: add dlist-mat-tri.cKeith Whitwell2009-06-302-0/+183
| | | |
| | * | progs/trivial: add test case for short-circuiting material changesKeith Whitwell2009-06-302-0/+175
| | | | | | | | | | | | | | | | | | | | Similar to dlist-tri-flat-tri, but using glMaterial calls, which have the extra property of being legal within Begin/End calls.
| | * | progs/trivial: add dlist-flat-tri.cKeith Whitwell2009-06-302-0/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | progs/trivial: add dlist-recursive-callKeith Whitwell2009-06-302-0/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | dlist-tri-flat-tri: make tri render differently if flatshade not enabledKeith Whitwell2009-06-301-1/+3
| | | | | | | | | | | | | | | | | | | | When testing flat-shading, it helps to specify per-vertex colors so that you can distinguish between flat & smooth shading.
| | * | Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuitKeith Whitwell2009-06-303-5/+170
| | |\ \ | | | | | | | | | | | | | | | Need this to pick up fixes for per-vertex materials.
| | * | | progs/trivial: test case for dlist statechange eliminationKeith Whitwell2009-06-302-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a display list with redundant call to glShadeModel. View dlist contents with MESA_VERBOSE=list
| | * | | progs/glsl: link with GLEW libraryBrian Paul2009-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit b1f2f92d9b2d190d39fb1b5c919c59c9539a025a)
| | * | | progs/util: make sure function pointers are initializedKeith Whitwell2009-06-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Call Init() from CompileShaderFile, was previously only called for the Text version of this function.
| * | | | progs/tests: Add tests for glCompressedTexSubImageJakob Bornecrantz2009-06-306-9/+4269
| | | | |
| * | | | xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAYJon TURNEY2009-06-304-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
| * | | | mesa/vbo: fix compile and replay of nodes ending in a FALLBACKKeith Whitwell2009-06-302-0/+160
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | progs/trivial: add test case for lighting plus per-vertex materialsKeith Whitwell2009-06-302-0/+150
| | | | | | | | | | | | | | | | Exercise material-within-begin/end case.
| * | | progs/isosurf: add materials mode for glVertex + TRISTRIPKeith Whitwell2009-06-301-5/+20
| | | |
* | | | demos: Set the depth mask correctly to get the desired blendingIan Romanick2009-06-302-4/+4
| | | |
* | | | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-301-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/vbo/vbo_exec_draw.c
| * | | progs/util: make sure function pointers are initializedKeith Whitwell2009-06-301-1/+6
| | | | | | | | | | | | | | | | | | | | Call Init() from CompileShaderFile, was previously only called for the Text version of this function.
* | | | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-291-1/+1
|\| | |
| * | | progs/glsl: link with GLEW libraryBrian Paul2009-06-291-1/+1
| |/ /
* | | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-06-1427-1/+106
|\| |
| * | progs/glsl: compile with scons and glewKeith Whitwell2009-06-2927-1/+106
| | | | | | | | | | | | Get most of these working with scons.
* | | Merge branch 'arb_vertex_array_object'Brian Paul2009-06-261-25/+95
|\ \ \
| * | | tests: update bufferobj.c to test GL_ARB_vertex_array_objectBrian Paul2009-06-221-25/+95
| | | |
* | | | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-261-2/+6
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h
| * | | demos: improve argv parsing in fslight.cBrian Paul2009-06-261-2/+6
| | | |
* | | | progs/tests: Add yet another mipmap testJakob Bornecrantz2009-06-144-0/+319
| | | |
* | | | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-243-127/+94
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | demos: fix issues in glxcontexts.cBrian Paul2009-06-231-114/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | progs/wgl: Fix shreadtex_mt too.José Fonseca2009-06-171-6/+24
| | | |
| * | | progs/wgl: Tweak the initialization wait in wglthreads.José Fonseca2009-06-171-2/+2
| | | | | | | | | | | | | | | | There was still a non-zero probability for wglShareLists of failing.
| * | | progs/wgl: Get wglShareLists working in wglthreads.José Fonseca2009-06-171-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | progs/wgl: Allow resizing wglthreads' windows.José Fonseca2009-06-171-1/+1
| | | |
* | | | demos: make cubemap work without EXT_fbo supportRoland Scheidegger2009-06-201-4/+13
| |/ / |/| | | | | | | | | | | use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation) is not available.
* | | Merge branch 'ext-provoking-vertex'Brian Paul2009-06-193-0/+631
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | tests: prim.c demo, modified for GL_EXT_provoking_vertexBrian Paul2009-06-092-0/+560
| | | |