aboutsummaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | 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/tests: Remove duplicate included header in vparray.c.Vinson Lee2010-01-111-1/+0
| | | |
| * | | progs/tests: Add newline to end of printf in vparray.c.Vinson Lee2010-01-111-1/+1
| | | |
| * | | progs/redbook: Remove unnecessary header from aapoly.c.Vinson Lee2010-01-111-1/+0
| | | |
| * | | progs/glsl: Remove duplicate included header from shtest.c.Vinson Lee2010-01-111-1/+0
| | | |
| * | | progs/demos: Remove unnecessary header from morph3d.c.Vinson Lee2010-01-111-1/+0
| | | |
| * | | progs/tests: Silence fprintf format warning.Vinson Lee2010-01-111-2/+2
| | | |
| * | | progs/demos: Remove unnecessary header from isosurf.c.Vinson Lee2010-01-111-1/+0
| | | |
| * | | progs/demos: Remove unnecessary header from fbotexture.c.Vinson Lee2010-01-111-1/+0
| | | |
| * | | progs/demos: Check upper bounds of input in manywin.c.Vinson Lee2010-01-101-0/+2
| | | |
| * | | progs/demos: Bounds check input to fire.c.Vinson Lee2010-01-101-1/+7
| | | |
| * | | progs/tests: Silence 'missing initializer' warnings.Vinson Lee2010-01-082-2/+2
| | | |
| * | | progs/glsl: Silence uninitialized variable warning.Vinson Lee2010-01-081-1/+1
| | | |
| * | | progs/demos: Add missing initializers in engine.c.Vinson Lee2010-01-081-3/+15
| | | |
* | | | 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/egl: Fix screen surface demos.Chia-I Wu2010-01-125-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | Set the screen surface size to the mode size, as the spec requires the screen surface size to be larger than the mode size. Besides, bind the API to OpenGL as they are written in it. Signed-off-by: Chia-I Wu <[email protected]>
* | | progs/egl: glGenTextures is called too early in xeglbindtex.Chia-I Wu2010-01-121-2/+2
| | | | | | | | | | | | | | | | | | It should be called after eglMakeCurrent. Signed-off-by: Chia-I Wu <[email protected]>
* | | progs: Check the number of configs returned by eglChooseConfig.Chia-I Wu2010-01-126-10/+14
| | | | | | | | | | | | | | | | | | | | | A successful eglChooseConfig call does not imply there are valid configs. Signed-off-by: Chia-I Wu <[email protected]>
* | | progs: Add missing EGL_RENDERABLE_TYPE for EGL demos.Chia-I Wu2010-01-126-0/+7
| | | | | | | | | | | | | | | | | | | | | The default value of EGL_RENDERABLE_TYPE is EGL_OPENGL_ES_BIT. The proper values should be specified if we are not using OpenGL ES. Signed-off-by: Chia-I Wu <[email protected]>
* | | Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesaJesse Barnes2010-01-114-41/+274
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts due to DRI1 removal: src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_screen.c
| * | | xdemos/glsync: handle no sync method betterJesse Barnes2010-01-081-8/+4
| | | | | | | | | | | | | | | | Print out count, finish rendering, etc. Makes the -sn option more useful.
| * | | xdemos/glsync: check glXMakeCurrent return valueJesse Barnes2010-01-081-1/+5
| | | | | | | | | | | | | | | | Since this program is used for testing, catching this case can be helpful.
| * | | xdemos/glsync: Make glsync test draw a rectangleJesse Barnes2010-01-081-34/+49
| | | | | | | | | | | | | | | | | | | | Doing simple buffer clears isn't enough to actually allocate render buffers, we need to do real drawing.
| * | | xdemos/glsync: Add swap interval support to glsync testJesse Barnes2010-01-081-3/+17
| | | |
| * | | DRI2: add OML_sync_control supportJesse Barnes2010-01-083-0/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add OML_sync_control support, along with a simple program for testing it. This means adding support for the DRI2GetMSC, DRI2WaitMSC and DRI2WaitSBC requests. Signed-off-by: Jesse Barnes <[email protected]>