summaryrefslogtreecommitdiff
path: root/progs/trivial
AgeCommit message (Collapse)Author
2010-01-31Merge remote branch 'origin/master' into lp-binningJosé Fonseca
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
2010-01-23Merge branch 'arb_half_float_vertex'Dave Airlie
2010-01-23progs: add trivial ARB_half_float_vertex support.Dave Airlie
This is just a trivial port of vp-array.c Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-01-22Merge branch 'mesa_7_7_branch'Brian Paul
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
2010-01-21progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.Vinson Lee
2010-01-16Merge remote branch 'origin/master' into lp-binningJosé Fonseca
Conflicts: src/gallium/drivers/llvmpipe/lp_quad.h src/gallium/drivers/llvmpipe/lp_setup.c
2010-01-14progs/trival: updated tri-scissor-tri.c testBrian Paul
The scissor left/right/bottom/top bounds can be moved by pressing the l/r/b/t and L/R/B/T keys.
2010-01-14Merge branch 'mesa_7_7_branch'Jakob Bornecrantz
Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
2010-01-14progs/trivial: test user clip plane in tri-point-line-clipped.cBrian Paul
2010-01-14progs/trivial: test glPolygonMode(POINT/LINE) with frustum clippingBrian Paul
Note whether the new verts introduced by clipping show up as points and lines along the edge of the window...
2010-01-11progs/trivial: Remove unnecessary headers from tri-fbo-tex.c.Vinson Lee
2010-01-11progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.Vinson Lee
2010-01-08Merge remote branch 'origin/master' into lp-binningJosé Fonseca
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
2010-01-01scons: Build progs together with everything else.José Fonseca
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
2009-12-22Merge branch 'i965g-restart'Keith Whitwell
Conflicts: configure.ac
2009-12-21Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
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
2009-12-21Merge commit 'origin/master' into i965g-restartKeith Whitwell
Conflicts: SConstruct configs/default configs/linux-dri
2009-12-19progs/trivial: Use C-style comments.Vinson Lee
2009-12-14progs/trivial: Silence compiler warnings.Vinson Lee
2009-12-12progs/trivial: Silence compiler warnings in tri-blend-min.c.Vinson Lee
2009-12-12progs/trivial: Silence compiler warnings in tri-blend-max.cVinson Lee
2009-12-03progs/trivial: Redraw upon keypress.Vinson Lee
(cherry picked from commit 9553a42f638bd98eb90e5b7fb37d6b82758b6363)
2009-12-03progs/trivial: Redraw upon keypress.Vinson Lee
(cherry picked from commit 3790c6a13b86dfe0afd4bb0bf9a4d9f4b429cfd8)
2009-12-03progs/trivial: readback and print Z value in tri-z-eq.cBrian Paul
2009-11-30progs/trivial: added two simple texture testsBrian Paul
One draws a series of quads with different textures. The other draws with one texture which is changed with glTexSubImage2D().
2009-11-19progs/trivial: Redraw upon keypress.Vinson Lee
2009-11-19progs/trivial: Redraw upon keypress.Vinson Lee
2009-11-11trivial: make tri-orig more closely match the original version of tri...Keith Whitwell
2009-11-06progs/trivial: IgnoresJakob Bornecrantz
2009-11-06trivial: add vbo-tri, an even simpler version of tri.cKeith Whitwell
2009-10-22Merge branch 'mesa_7_6_branch' of ↵Alex Deucher
git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa
2009-10-20progs/trivial: check if GL_ARB_occlusion_query is supportedBrian Paul
2009-10-09progs: Remove unused empty file.José Fonseca
2009-07-28Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h
2009-07-28progs/trivial: add missing files to Makefile, .gitignoreVinson Lee
2009-12-15Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick
Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
2009-07-03Merge branch 'mesa_7_5_branch'Jakob Bornecrantz
Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
2009-06-30mesa/vbo: fix compile and replay of nodes ending in a FALLBACKKeith Whitwell
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-30progs/trivial: add dlist-mat-tri.cKeith Whitwell
2009-06-30progs/trivial: add test case for short-circuiting material changesKeith Whitwell
Similar to dlist-tri-flat-tri, but using glMaterial calls, which have the extra property of being legal within Begin/End calls.
2009-06-30progs/trivial: add dlist-flat-tri.cKeith Whitwell
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-30progs/trivial: add dlist-recursive-callKeith Whitwell
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-30dlist-tri-flat-tri: make tri render differently if flatshade not enabledKeith Whitwell
When testing flat-shading, it helps to specify per-vertex colors so that you can distinguish between flat & smooth shading.
2009-06-30Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuitKeith Whitwell
Need this to pick up fixes for per-vertex materials.
2009-06-30progs/trivial: add test case for lighting plus per-vertex materialsKeith Whitwell
Exercise material-within-begin/end case.
2009-06-30progs/trivial: test case for dlist statechange eliminationKeith Whitwell
Creates a display list with redundant call to glShadeModel. View dlist contents with MESA_VERBOSE=list
2009-06-04Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: src/mesa/main/context.c
2009-06-01trivial/tri-z: add controls for depthrange min/maxKeith Whitwell
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-05-12progs/trivial: update .gitignore with new binariesJoakim Sindholt
2009-05-11trivial: destroy window upon exitBrian Paul