c7be039fad
progs/trivial: use -c option to use glCopyPixels()
...
Otherwise we use glRead/DrawPixels to copy the off-screen FBO image
into the window.
Looks like NVIDIA's broken when using -c (the image is upside down),
but OK with -c -t.
2010-03-10 14:37:05 -07:00
d5ccbea63c
progs/trivial: make clear-fbo-scissor.c work with other GL drivers
...
NVIDIA's driver requires that the texture that we're going to render into
be complete. Need to set min/mag filters to non-mipmap modes.
Plus added other error/debug checks.
2010-03-10 14:37:05 -07:00
3c48f40f61
progs/trivial: add -t (RTT) option for clear-fbo-scissor.c
2010-03-10 12:19:41 -07:00
9a7ba79b2b
progs/trivial: added clear-fbo-scissor.c to test scissored clear of FBO
2010-03-10 11:52:07 -07:00
0c20b30333
Fix up more stale references to gl(X)_API.xml which have moved.
...
AFAICT the getproc* stanzas in progs/{fp,trivial}/Makefile are completely
unused at this point, so just remove them.
2010-02-26 10:48:07 +01:00
82e5a11077
progs/trivial: Update .gitignore.
2010-02-18 01:24:20 -08:00
bee9964b29
Merge remote branch 'origin/master' into lp-binning
...
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-31 05:36:33 +00:00
782b6885c2
Merge branch 'arb_half_float_vertex'
2010-01-23 12:29:33 +10:00
dcaf6687e8
progs: add trivial ARB_half_float_vertex support.
...
This is just a trivial port of vp-array.c
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-01-23 12:28:28 +10:00
cd8614b028
Merge branch 'mesa_7_7_branch'
...
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-22 12:17:02 -07:00
8bc3c06d86
progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.
2010-01-21 23:24:40 -08:00
ba5d600c90
Merge remote branch 'origin/master' into lp-binning
...
Conflicts:
src/gallium/drivers/llvmpipe/lp_quad.h
src/gallium/drivers/llvmpipe/lp_setup.c
2010-01-16 23:21:06 +00:00
8b29d39e99
progs/trival: updated tri-scissor-tri.c test
...
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-14 19:22:38 -07:00
b01ffb12ed
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
2010-01-14 22:31:04 +00:00
7fcfb71931
progs/trivial: test user clip plane in tri-point-line-clipped.c
2010-01-14 09:38:47 -07:00
0a82692154
progs/trivial: test glPolygonMode(POINT/LINE) with frustum clipping
...
Note whether the new verts introduced by clipping show up as points
and lines along the edge of the window...
2010-01-14 09:22:30 -07:00
477d51537f
progs/trivial: Remove unnecessary headers from tri-fbo-tex.c.
2010-01-11 20:21:50 -08:00
7241f5140f
progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.
2010-01-11 20:15:59 -08:00
080c40ab32
Merge remote branch 'origin/master' into lp-binning
...
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-08 15:42:57 +00:00
7bbf7f94ea
scons: Build progs together with everything else.
...
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
2010-01-01 12:16:19 +00:00
aa02683e45
Merge branch 'i965g-restart'
...
Conflicts:
configure.ac
2009-12-22 09:40:39 +00:00
b57abd3bea
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
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-21 18:23:53 -07:00
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
d87d71036c
progs/trivial: Use C-style comments.
2009-12-19 00:28:01 -08:00
0a8d508854
progs/trivial: Silence compiler warnings.
2009-12-14 18:11:57 -08:00
588e9f69c4
progs/trivial: Silence compiler warnings in tri-blend-min.c.
2009-12-12 15:47:17 -08:00
786899f153
progs/trivial: Silence compiler warnings in tri-blend-max.c
2009-12-12 14:20:17 -08:00
56de7e222e
progs/trivial: Redraw upon keypress.
...
(cherry picked from commit 9553a42f63
2009-12-03 17:27:24 -08:00
34a0b22a74
progs/trivial: Redraw upon keypress.
...
(cherry picked from commit 3790c6a13b
2009-12-03 17:25:00 -08:00
52081f0a2c
progs/trivial: readback and print Z value in tri-z-eq.c
2009-12-03 11:43:19 -07:00
344a2a9abb
progs/trivial: added two simple texture tests
...
One draws a series of quads with different textures.
The other draws with one texture which is changed with glTexSubImage2D().
2009-11-30 15:31:34 -07:00
9553a42f63
progs/trivial: Redraw upon keypress.
2009-11-19 22:52:05 -08:00
3790c6a13b
progs/trivial: Redraw upon keypress.
2009-11-19 13:03:12 -08:00
98c2b53381
trivial: make tri-orig more closely match the original version of tri...
2009-11-11 18:51:57 -08:00
8353162a4c
progs/trivial: Ignores
2009-11-06 18:40:23 +00:00
5a24c66915
trivial: add vbo-tri, an even simpler version of tri.c
2009-11-06 09:34:02 +00:00
5e77b61e39
Merge branch 'mesa_7_6_branch' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa
2009-10-22 12:02:31 -04:00
5283a3fb25
progs/trivial: check if GL_ARB_occlusion_query is supported
2009-10-20 16:22:03 -06:00
d54e9f54d0
progs: Remove unused empty file.
2009-10-09 11:08:17 +01:00
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
bc60b88411
progs/trivial: add missing files to Makefile, .gitignore
2009-07-28 08:54:48 -06:00
11522b74b3
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
src/gallium/drivers/softpipe/sp_quad_blend.c
2009-12-15 12:38:01 -08:00
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
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
c48c01c9e7
progs/trivial: add dlist-mat-tri.c
2009-06-30 18:37:34 +01:00
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
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
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
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
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
Brian Paul
Michel Dänzer
Vinson Lee
José Fonseca
Dave Airlie
Dave Airlie
Jakob Bornecrantz
Keith Whitwell
Alex Deucher
Ian Romanick