aboutsummaryrefslogtreecommitdiffstats
path: root/progs/trivial
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-313-1/+216
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/lp_flush.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/llvmpipe/lp_tile_cache.c src/mesa/state_tracker/st_cb_condrender.c
| * Merge branch 'arb_half_float_vertex'Dave Airlie2010-01-232-0/+216
| |\
| | * progs: add trivial ARB_half_float_vertex support.Dave Airlie2010-01-232-0/+216
| | | | | | | | | | | | | | | | | | This is just a trivial port of vp-array.c Signed-off-by: Dave Airlie <[email protected]>
| * | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-221-1/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
| | * progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.Vinson Lee2010-01-211-1/+0
| | |
* | | Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-165-3/+118
|\| | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/llvmpipe/lp_quad.h src/gallium/drivers/llvmpipe/lp_setup.c
| * | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2010-01-142-3/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
| | * progs/trivial: Remove unnecessary headers from tri-fbo-tex.c.Vinson Lee2010-01-111-2/+0
| | |
| | * progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.Vinson Lee2010-01-111-1/+0
| | |
| * | progs/trivial: test user clip plane in tri-point-line-clipped.cBrian Paul2010-01-141-5/+30
| | |
| * | progs/trivial: test glPolygonMode(POINT/LINE) with frustum clippingBrian Paul2010-01-143-0/+93
| | | | | | | | | | | | | | | Note whether the new verts introduced by clipping show up as points and lines along the edge of the window...
* | | progs/trival: updated tri-scissor-tri.c testBrian Paul2010-01-141-11/+47
| | | | | | | | | | | | | | | The scissor left/right/bottom/top bounds can be moved by pressing the l/r/b/t and L/R/B/T keys.
* | | Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-08126-155/+283
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/Makefile src/gallium/drivers/llvmpipe/SConscript src/gallium/drivers/llvmpipe/lp_bld_arit.c src/gallium/drivers/llvmpipe/lp_bld_flow.c src/gallium/drivers/llvmpipe/lp_bld_interp.c src/gallium/drivers/llvmpipe/lp_clear.c src/gallium/drivers/llvmpipe/lp_context.c src/gallium/drivers/llvmpipe/lp_context.h src/gallium/drivers/llvmpipe/lp_draw_arrays.c src/gallium/drivers/llvmpipe/lp_jit.c src/gallium/drivers/llvmpipe/lp_jit.h src/gallium/drivers/llvmpipe/lp_prim_vbuf.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_setup_point.c src/gallium/drivers/llvmpipe/lp_state.h src/gallium/drivers/llvmpipe/lp_state_blend.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_sampler.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_tex_cache.h src/gallium/drivers/llvmpipe/lp_tex_sample.h src/gallium/drivers/llvmpipe/lp_tile_cache.c
| * | scons: Build progs together with everything else.José Fonseca2010-01-011-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is a substantial reorganization, This particular commit enables: - building the progs for unices platforms - glew is now built as a shared library (it is the default, and it is inconvenient and pointless to shift away from that default) - all progs get built by default
| * | Merge branch 'i965g-restart'Keith Whitwell2009-12-224-5/+138
| |\ \ | | |/ | |/| | | | | | | Conflicts: configure.ac
| | * Merge commit 'origin/master' into i965g-restartKeith Whitwell2009-12-21108-108/+108
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SConstruct configs/default configs/linux-dri
| | * | trivial: make tri-orig more closely match the original version of tri...Keith Whitwell2009-11-111-5/+5
| | | |
| | * | progs/trivial: IgnoresJakob Bornecrantz2009-11-061-0/+1
| | | |
| | * | trivial: add vbo-tri, an even simpler version of tri.cKeith Whitwell2009-11-062-0/+132
| | | |
| * | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-2110-12/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h
| | * | | progs/trivial: Use C-style comments.Vinson Lee2009-12-1910-12/+12
| | | | |
| * | | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-157-21/+18
| |\| | | | | |_|/ | |/| | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
| | * | progs/trivial: Silence compiler warnings.Vinson Lee2009-12-145-15/+12
| | | |
| | * | progs/trivial: Silence compiler warnings in tri-blend-min.c.Vinson Lee2009-12-121-3/+3
| | | |
| | * | progs/trivial: Silence compiler warnings in tri-blend-max.cVinson Lee2009-12-121-3/+3
| | | |
| | * | progs/trivial: Redraw upon keypress.Vinson Lee2009-12-034-4/+4
| | | | | | | | | | | | | | | | (cherry picked from commit 9553a42f638bd98eb90e5b7fb37d6b82758b6363)
| | * | progs/trivial: Redraw upon keypress.Vinson Lee2009-12-03104-104/+104
| | | | | | | | | | | | | | | | (cherry picked from commit 3790c6a13b86dfe0afd4bb0bf9a4d9f4b429cfd8)
| * | | progs/trivial: Redraw upon keypress.Vinson Lee2009-11-194-4/+4
| | | |
| * | | progs/trivial: Redraw upon keypress.Vinson Lee2009-11-19104-104/+104
| | |/ | |/|
| * | Merge branch 'mesa_7_6_branch' of ↵Alex Deucher2009-10-221-0/+5
| |\| | | | | | | | | | git+ssh://[email protected]/git/mesa/mesa
| | * progs/trivial: check if GL_ARB_occlusion_query is supportedBrian Paul2009-10-201-0/+5
| | |
| * | progs: Remove unused empty file.José Fonseca2009-10-091-0/+0
| |/
* | progs/trivial: readback and print Z value in tri-z-eq.cBrian Paul2009-12-031-3/+11
| |
* | progs/trivial: added two simple texture testsBrian Paul2009-11-304-0/+284
|/ | | | | One draws a series of quads with different textures. The other draws with one texture which is changed with glTexSubImage2D().
* Merge branch 'mesa_7_5_branch'Brian Paul2009-07-282-0/+23
|\ | | | | | | | | | | | | | | | | Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h
| * progs/trivial: add missing files to Makefile, .gitignoreVinson Lee2009-07-282-0/+23
| |
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-07-038-0/+1203
|\| | | | | | | | | | | Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
| * 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-302-0/+150
| |\ | | | | | | | | | Need this to pick up fixes for per-vertex materials.
| | * progs/trivial: add test case for lighting plus per-vertex materialsKeith Whitwell2009-06-302-0/+150
| | | | | | | | | | | | Exercise material-within-begin/end case.
| * | 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
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-041-10/+40
|\| | | | | | | | | | | Conflicts: src/mesa/main/context.c
| * trivial/tri-z: add controls for depthrange min/maxKeith Whitwell2009-06-011-10/+40
| | | | | | | | | | 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.
* | progs/trivial: update .gitignore with new binariesJoakim Sindholt2009-05-121-0/+3
|/
* trivial: destroy window upon exitBrian Paul2009-05-111-0/+1
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 12:37:13 +0000