summaryrefslogtreecommitdiff
path: root/progs
AgeCommit message (Collapse)AuthorFilesLines
2010-02-08progs/demos: update .gitignoreJoakim Sindholt1-0/+1
2010-02-08progs/xdemos: Silence uninitialized variable warning.Vinson Lee1-1/+1
2010-02-05progs/demos: fix typoBrian Paul1-1/+1
2010-02-05Merge remote branch 'origin/lp-binning'José Fonseca8-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
2010-02-04scons: Use only the shared object name when linking progs.José Fonseca1-1/+2
Otherwise the whole path gets baked into the executable.
2010-02-03progs/fpglsl: couple more testsKeith Whitwell2-0/+21
2010-02-03progs/fpglsl: fp-tris for glslKeith Whitwell6-0/+487
2010-02-02progs/es2: Fix an assertion failure in tri.Chia-I Wu1-2/+3
EGL_SURFACE_TYPE is a config attribute, not a surface attribute. Thanks to Mike Stroyan for pointing out this error.
2010-02-01progs/tests: add another FBO test to exercise a RGBA vs. Z texture bugBrian Paul3-0/+233
See comments in file for more details.
2010-01-31Merge remote branch 'origin/master' into lp-binningJosé Fonseca51-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
2010-01-31progs/egl: Update eglinfo to display more attributes.Chia-I Wu2-11/+21
Add config caveat, bind-to-texture, and renderable type. Remove double buffer and stereo attributes.
2010-01-30progs/es1: Add bindtex.Chia-I Wu3-17/+14
It is ported from progs/egl/xeglbindtex.c. With the OpenGL ES port, the OpenGL version is removed.
2010-01-29progs/demos: new image dissolve demoBrian Paul3-0/+160
Dissolve between two images using a random pattern in the stencil buffer and a varying stencil ref value.
2010-01-29progs/tests: added a few more files to .gitignoreBrian Paul1-0/+3
2010-01-28progs/tests: Remove unnecessary headers.Vinson Lee10-14/+0
2010-01-28progs/glsl: Fix bump GLSL compilation error on Mac OS.Vinson Lee1-1/+1
2010-01-28progs/glsl: Remove unused variable in bump.c.Vinson Lee1-1/+0
2010-01-28progs/glsl: Remove unnecessary header from samplers.c.Vinson Lee1-1/+0
2010-01-26support an 'embedded' platform target which turns off most parts of theAlan Hourihane1-35/+36
build.
2010-01-26glxgears: Support GLX_EXT_swap_control for querying the current swap interval.Aaron Plattner1-3/+10
Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Brian Paul <brianp@vmware.com>
2010-01-26progs/tests: use glDrawRangeElements() in bufferobj.cBrian Paul1-1/+7
2010-01-25Merge branch 'mesa_7_7_branch'Brian Paul2-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
2010-01-23progs/demos: Remove unnecessary header from shadowtex.c.Vinson Lee2-8/+0
2010-01-23Merge branch 'arb_half_float_vertex'Dave Airlie2-0/+216
2010-01-23Revert "add segl"Chia-I Wu5-424/+0
This reverts commit fe33b7083b0081b91ee338acbe966400c6b9a7b9. It was not supposed to be pushed yet.
2010-01-23progs: add trivial ARB_half_float_vertex support.Dave Airlie2-0/+216
This is just a trivial port of vp-array.c Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-01-23add seglChia-I Wu5-0/+424
2010-01-22Merge branch 'mesa_7_7_branch'Brian Paul2-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
2010-01-22progs/xdemos: add z/Z keys for scaling the renderingBrian Paul1-0/+10
2010-01-21progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.Vinson Lee1-1/+0
2010-01-21progs/demos: call glutDestroyWindow() upon exitBrian Paul1-1/+4
2010-01-21progs/fp: testcases for GL_ARB_fragment_coord_conventionsBrian Paul4-0/+22
Based on a patch from Luca Barbieri but moved the comments after the !!ARBfp1.0 header
2010-01-20Merge remote branch 'origin/opengl-es-v2'Chia-I Wu18-0/+5482
2010-01-18glxgears: unbind current context before "destroying" itMarcin Slusarz1-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 <brianp@vmware.com>
2010-01-18progs/egl: Pass EGLDisplay to eglCopyBuffers.Chia-I Wu1-1/+1
X Display was wrongly passed to eglCopyBuffers.
2010-01-16Merge remote branch 'origin/master' into lp-binningJosé Fonseca39-203/+536
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 Paul1-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.
2010-01-14Merge branch 'mesa_7_7_branch'Jakob Bornecrantz16-20/+30
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 Paul1-5/+30
2010-01-14progs/trivial: test glPolygonMode(POINT/LINE) with frustum clippingBrian Paul3-0/+93
Note whether the new verts introduced by clipping show up as points and lines along the edge of the window...
2010-01-11progs/xdemos: Remove unnecessary header from corender.c.Vinson Lee1-1/+0
2010-01-11progs/trivial: Remove unnecessary headers from tri-fbo-tex.c.Vinson Lee1-2/+0
2010-01-11progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.Vinson Lee1-1/+0
2010-01-11progs/tests: Remove duplicate included header in vparray.c.Vinson Lee1-1/+0
2010-01-11progs/tests: Add newline to end of printf in vparray.c.Vinson Lee1-1/+1
2010-01-11progs/redbook: Remove unnecessary header from aapoly.c.Vinson Lee1-1/+0
2010-01-11progs/glsl: Remove duplicate included header from shtest.c.Vinson Lee1-1/+0
2010-01-11progs/demos: Remove unnecessary header from morph3d.c.Vinson Lee1-1/+0
2010-01-12progs/es2: Correctly set renderable type and client version.Chia-I Wu3-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 <olvaffe@gmail.com>
2010-01-12progs/es1: Bind texture image after rendering.Chia-I Wu1-3/+5
Unlike FBO, eglBindTexImage is supposed to be called after rendering. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>