fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-18 07:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
30154 commits 66 branches 935 tags 942 MiB
Commit graph

1889 commits

Author SHA1 Message Date
Aaron Plattner
cec0e7c086 glxgears: Support GLX_EXT_swap_control for querying the current swap interval. 
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
 2010-01-26 12:00:51 -07:00
Brian Paul
782f66c8a2 progs/tests: use glDrawRangeElements() in bufferobj.c 2010-01-26 10:48:00 -07:00
Brian Paul
9b22427911 Merge branch 'mesa_7_7_branch' 
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-25 14:46:17 -07:00
Vinson Lee
7f2f42dd80 progs/demos: Remove unnecessary header from shadowtex.c. 2010-01-23 20:56:49 -08:00
Dave Airlie
782b6885c2 Merge branch 'arb_half_float_vertex' 2010-01-23 12:29:33 +10:00
Chia-I Wu
0928418922 Revert "add segl" 
This reverts commit fe33b7083b.  It was
not supposed to be pushed yet.
 2010-01-23 10:33:03 +08:00
Dave Airlie
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
Chia-I Wu
fe33b7083b add segl 2010-01-23 10:10:47 +08:00
Brian Paul
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
Brian Paul
2f1a49e335 progs/xdemos: add z/Z keys for scaling the rendering 2010-01-22 08:08:45 -07:00
Vinson Lee
8bc3c06d86 progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c. 2010-01-21 23:24:40 -08:00
Brian Paul
1ca2285511 progs/fp: testcases for GL_ARB_fragment_coord_conventions 
Based on a patch from Luca Barbieri but moved the comments after
the !!ARBfp1.0 header
 2010-01-21 09:38:50 -07:00
Chia-I Wu
5e8240320a Merge remote branch 'origin/opengl-es-v2' 2010-01-20 10:02:15 +08:00
Marcin Slusarz
23ae318200 glxgears: unbind current context before "destroying" it 
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-18 10:44:53 -07:00
Chia-I Wu
8311a49b2d progs/egl: Pass EGLDisplay to eglCopyBuffers. 
X Display was wrongly passed to eglCopyBuffers.
 2010-01-18 17:07:19 +08:00
Jakob Bornecrantz
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
Brian Paul
7fcfb71931 progs/trivial: test user clip plane in tri-point-line-clipped.c 2010-01-14 09:38:47 -07:00
Brian Paul
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
Vinson Lee
8e9ceb8309 progs/xdemos: Remove unnecessary header from corender.c. 2010-01-11 20:24:57 -08:00
Vinson Lee
477d51537f progs/trivial: Remove unnecessary headers from tri-fbo-tex.c. 2010-01-11 20:21:50 -08:00
Vinson Lee
7241f5140f progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c. 2010-01-11 20:15:59 -08:00
Vinson Lee
ae8ed89f24 progs/tests: Remove duplicate included header in vparray.c. 2010-01-11 19:58:08 -08:00
Vinson Lee
6ed607cce6 progs/tests: Add newline to end of printf in vparray.c. 2010-01-11 19:56:04 -08:00
Vinson Lee
7bfa54c6a4 progs/redbook: Remove unnecessary header from aapoly.c. 2010-01-11 19:52:22 -08:00
Vinson Lee
2178abfba3 progs/glsl: Remove duplicate included header from shtest.c. 2010-01-11 19:42:55 -08:00
Vinson Lee
78ddce9fda progs/demos: Remove unnecessary header from morph3d.c. 2010-01-11 19:29:26 -08:00
Chia-I Wu
76e726515a progs/es2: Correctly set renderable type and client version. 
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-12 11:25:09 +08:00
Chia-I Wu
43f67b61fd progs/es1: Bind texture image after rendering. 
Unlike FBO, eglBindTexImage is supposed to be called after rendering.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
 2010-01-12 11:25:09 +08:00
Chia-I Wu
562c127693 Merge branch 'master' into opengl-es-v2 
Conflicts:
	src/mesa/main/dd.h
 2010-01-12 11:25:02 +08:00
Vinson Lee
f07e87ffba progs/tests: Silence fprintf format warning. 2010-01-11 19:16:36 -08:00
Vinson Lee
b4bc208529 progs/demos: Remove unnecessary header from isosurf.c. 2010-01-11 19:03:18 -08:00
Chia-I Wu
472a601966 progs/egl: Fix screen surface demos. 
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 <olvaffe@gmail.com>
 2010-01-12 10:55:35 +08:00
Chia-I Wu
c657c80180 progs/egl: glGenTextures is called too early in xeglbindtex. 
It should be called after eglMakeCurrent.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
 2010-01-12 10:55:35 +08:00
Chia-I Wu
3bcb08f6c4 progs: Check the number of configs returned by eglChooseConfig. 
A successful eglChooseConfig call does not imply there are valid
configs.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
 2010-01-12 10:55:35 +08:00
Chia-I Wu
033bd95802 progs: Add missing EGL_RENDERABLE_TYPE for EGL demos. 
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 <olvaffe@gmail.com>
 2010-01-12 10:55:35 +08:00
Jesse Barnes
c6ef705e41 Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa 
Conflicts due to DRI1 removal:
	src/mesa/drivers/dri/intel/intel_context.c
	src/mesa/drivers/dri/intel/intel_screen.c
 2010-01-11 15:23:29 -05:00
Jesse Barnes
c642f3941b xdemos/glsync: handle no sync method better 
Print out count, finish rendering, etc.  Makes the -sn option more useful.
 2010-01-08 12:37:44 -05:00
Jesse Barnes
0269dc19b5 xdemos/glsync: check glXMakeCurrent return value 
Since this program is used for testing, catching this case can be helpful.
 2010-01-08 12:37:43 -05:00
Jesse Barnes
f860aac0d8 xdemos/glsync: Make glsync test draw a rectangle 
Doing simple buffer clears isn't enough to actually allocate render buffers, we
need to do real drawing.
 2010-01-08 12:37:43 -05:00
Jesse Barnes
f35f666f81 xdemos/glsync: Add swap interval support to glsync test 2010-01-08 12:37:43 -05:00
Jesse Barnes
daf7fe69f7 DRI2: add OML_sync_control support 
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 <jbarnes@virtuousgeek.org>
 2010-01-08 12:31:10 -05:00
Brian Paul
fd70841121 Merge branch 'mesa_7_7_branch' 
Conflicts:

	src/mesa/drivers/dri/i965/brw_wm_emit.c
 2010-01-08 08:21:12 -07:00
Brian Paul
7c55fe9bfd progs/fp: increase buffer size to read larger shaders 2010-01-07 09:20:48 -07:00
Brian Paul
2b7a4b2c0e progs/fp: remove invalid tri-inv.c test 
INV is not a valid instruction.
 2010-01-07 08:22:39 -07:00
Vinson Lee
d42467687e progs/demos: Assert that input to malloc is valid. 2010-01-06 21:39:44 -08:00
Vinson Lee
6d6c9c6688 progs/demos: Remove unnecessary header from fbotexture.c. 2010-01-11 00:24:39 -08:00
Vinson Lee
199dedd6dd progs/demos: Check upper bounds of input in manywin.c. 2010-01-10 01:57:13 -08:00
Vinson Lee
0c7814fe23 progs/demos: Bounds check input to fire.c. 2010-01-10 00:40:46 -08:00
Vinson Lee
683e3cb8db progs/tests: Silence 'missing initializer' warnings. 2010-01-08 23:08:57 -08:00
Vinson Lee
223c8482ca progs/glsl: Silence uninitialized variable warning. 2010-01-08 22:10:52 -08:00