summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* progs/demos: fix typoBrian Paul2010-02-051-1/+1
|
* Merge remote branch 'origin/lp-binning'José Fonseca2010-02-058-16/+352
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_dl.c src/gallium/auxiliary/util/u_time.h src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_tile_cache.c
| * Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-3151-94/+5984
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | progs/demos: call glutDestroyWindow() upon exitBrian Paul2010-01-211-1/+4
| | |
| * | Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-1639-203/+536
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/llvmpipe/lp_quad.h src/gallium/drivers/llvmpipe/lp_setup.c
| * | | 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-08348-1253/+2760
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | progs/demos/gloss: press 'n' to advance by one frameBrian Paul2009-12-091-0/+3
| | | | |
| * | | | progs/demos: call glutDestroyWindow() in gloss.cBrian Paul2009-12-091-1/+3
| | | | |
| * | | | 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().
* | | | | scons: Use only the shared object name when linking progs.José Fonseca2010-02-041-1/+2
| | | | | | | | | | | | | | | | | | | | Otherwise the whole path gets baked into the executable.
* | | | | progs/fpglsl: couple more testsKeith Whitwell2010-02-032-0/+21
| | | | |
* | | | | progs/fpglsl: fp-tris for glslKeith Whitwell2010-02-036-0/+487
| | | | |
* | | | | progs/es2: Fix an assertion failure in tri.Chia-I Wu2010-02-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | EGL_SURFACE_TYPE is a config attribute, not a surface attribute. Thanks to Mike Stroyan for pointing out this error.
* | | | | progs/tests: add another FBO test to exercise a RGBA vs. Z texture bugBrian Paul2010-02-013-0/+233
| |_|_|/ |/| | | | | | | | | | | See comments in file for more details.
* | | | progs/egl: Update eglinfo to display more attributes.Chia-I Wu2010-01-312-11/+21
| | | | | | | | | | | | | | | | | | | | Add config caveat, bind-to-texture, and renderable type. Remove double buffer and stereo attributes.
* | | | progs/es1: Add bindtex.Chia-I Wu2010-01-303-17/+14
| | | | | | | | | | | | | | | | | | | | It is ported from progs/egl/xeglbindtex.c. With the OpenGL ES port, the OpenGL version is removed.
* | | | progs/demos: new image dissolve demoBrian Paul2010-01-293-0/+160
| | | | | | | | | | | | | | | | | | | | Dissolve between two images using a random pattern in the stencil buffer and a varying stencil ref value.
* | | | progs/tests: added a few more files to .gitignoreBrian Paul2010-01-291-0/+3
| | | |
* | | | progs/tests: Remove unnecessary headers.Vinson Lee2010-01-2810-14/+0
| | | |
* | | | progs/glsl: Fix bump GLSL compilation error on Mac OS.Vinson Lee2010-01-281-1/+1
| | | |
* | | | progs/glsl: Remove unused variable in bump.c.Vinson Lee2010-01-281-1/+0
| | | |
* | | | progs/glsl: Remove unnecessary header from samplers.c.Vinson Lee2010-01-281-1/+0
| | | |
* | | | support an 'embedded' platform target which turns off most parts of theAlan Hourihane2010-01-261-35/+36
| | | | | | | | | | | | | | | | build.
* | | | glxgears: Support GLX_EXT_swap_control for querying the current swap interval.Aaron Plattner2010-01-261-3/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Plattner <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* | | | progs/tests: use glDrawRangeElements() in bufferobj.cBrian Paul2010-01-261-1/+7
| | | |
* | | | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-252-8/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c
| * | | | progs/demos: Remove unnecessary header from shadowtex.c.Vinson Lee2010-01-232-8/+0
| | | | |
* | | | | 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]>
* | | | | | Revert "add segl"Chia-I Wu2010-01-235-424/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fe33b7083b0081b91ee338acbe966400c6b9a7b9. It was not supposed to be pushed yet.
* | | | | | add seglChia-I Wu2010-01-235-0/+424
| | | | | |
* | | | | | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-222-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| * | | | | glxgears: unbind current context before "destroying" itMarcin Slusarz2010-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glXDestroyContext does not destroy the context if it's still connected to some window. Unbind context from window to test it. Signed-off-by: Brian Paul <[email protected]>
* | | | | | progs/xdemos: add z/Z keys for scaling the renderingBrian Paul2010-01-221-0/+10
| |/ / / / |/| | | |
* | | | | progs/fp: testcases for GL_ARB_fragment_coord_conventionsBrian Paul2010-01-214-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Based on a patch from Luca Barbieri but moved the comments after the !!ARBfp1.0 header
* | | | | Merge remote branch 'origin/opengl-es-v2'Chia-I Wu2010-01-2018-0/+5482
|\ \ \ \ \
| * | | | | progs/es2: Correctly set renderable type and client version.Chia-I Wu2010-01-123-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly set EGL_RENDERABLE_TYPE and EGL_CONTEXT_CLIENT_VERSION for OpenGL ES 2.0. Because es2_info is copied from es1_info, the fix for it actually goes to es1_info. Signed-off-by: Chia-I Wu <[email protected]>
| * | | | | progs/es1: Bind texture image after rendering.Chia-I Wu2010-01-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike FBO, eglBindTexImage is supposed to be called after rendering. Signed-off-by: Chia-I Wu <[email protected]>
| * | | | | Merge branch 'master' into opengl-es-v2Chia-I Wu2010-01-12342-1268/+2401
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h
| * | | | | | progs/es1: Add compressed paletted texture tests to torus.Chia-I Wu2010-01-041-2/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests can be toggled by `t'. It will print current texture format and the size of the image. Signed-off-by: Chia-I Wu <[email protected]>
| * | | | | | progs/es1: Port eglgears to OpenGL ES 1.1.Chia-I Wu2009-11-103-0/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This demo requires EGL_MESA_screen_surface to run. Signed-off-by: Chia-I Wu <[email protected]>
| * | | | | | progs/es1: Port egltri to OpenGL ES 1.1.Chia-I Wu2009-11-105-0/+466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This demo requires EGL_MESA_screen_surface to run. Signed-off-by: Chia-I Wu <[email protected]>
| * | | | | | progs/es: Add .gitignore.Chia-I Wu2009-11-102-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]>
| * | | | | | progs/es: OpenGL ES 1.x and 2.X demo programs.Chia-I Wu2009-11-0511-0/+4461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The demo programs are written by Brian Paul, and cherry-picked from opengl-es branch. Several minor issues such as a linking problem are fixed. Signed-off-by: Chia-I Wu <[email protected]>
* | | | | | | progs/egl: Pass EGLDisplay to eglCopyBuffers.Chia-I Wu2010-01-181-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | X Display was wrongly passed to eglCopyBuffers.
* | | | | | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2010-01-1416-20/+30
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
| * | | | | progs/xdemos: Remove unnecessary header from corender.c.Vinson Lee2010-01-111-1/+0
| | | | | |