ef67ad05cb
scons: Use only the shared object name when linking progs.
...
Otherwise the whole path gets baked into the executable.
2010-02-04 09:23:30 +00:00
9f1ee5a864
progs/fpglsl: couple more tests
2010-02-03 10:36:55 +00:00
d7b1610ced
progs/fpglsl: fp-tris for glsl
2010-02-03 10:36:55 +00:00
5fa4ea2934
progs/es2: Fix an assertion failure in tri.
...
EGL_SURFACE_TYPE is a config attribute, not a surface attribute. Thanks
to Mike Stroyan for pointing out this error.
2010-02-02 10:45:00 +08:00
04b14e26a2
progs/tests: add another FBO test to exercise a RGBA vs. Z texture bug
...
See comments in file for more details.
2010-02-01 19:02:52 -07:00
89e6eb5fbe
progs/egl: Update eglinfo to display more attributes.
...
Add config caveat, bind-to-texture, and renderable type. Remove double
buffer and stereo attributes.
2010-01-31 11:20:15 +08:00
7056a74734
progs/es1: Add bindtex.
...
It is ported from progs/egl/xeglbindtex.c. With the OpenGL ES port, the
OpenGL version is removed.
2010-01-30 23:16:17 +08:00
b8d4cbd7e2
progs/demos: new image dissolve demo
...
Dissolve between two images using a random pattern in the stencil
buffer and a varying stencil ref value.
2010-01-29 14:01:34 -07:00
e94021660b
progs/tests: added a few more files to .gitignore
2010-01-29 08:43:28 -07:00
d40070029f
progs/tests: Remove unnecessary headers.
2010-01-28 15:11:39 -08:00
bbb41153c2
progs/glsl: Fix bump GLSL compilation error on Mac OS.
2010-01-28 14:58:24 -08:00
77b1f2fbcf
progs/glsl: Remove unused variable in bump.c.
2010-01-28 14:54:10 -08:00
07fb52bcf6
progs/glsl: Remove unnecessary header from samplers.c.
2010-01-28 14:22:15 -08:00
dea98eb792
support an 'embedded' platform target which turns off most parts of the
...
build.
2010-01-26 20:59:12 +00:00
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
782f66c8a2
progs/tests: use glDrawRangeElements() in bufferobj.c
2010-01-26 10:48:00 -07:00
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
7f2f42dd80
progs/demos: Remove unnecessary header from shadowtex.c.
2010-01-23 20:56:49 -08:00
782b6885c2
Merge branch 'arb_half_float_vertex'
2010-01-23 12:29:33 +10:00
0928418922
Revert "add segl"
...
This reverts commit fe33b7083b
2010-01-23 10:33:03 +08: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
fe33b7083b
add segl
2010-01-23 10:10:47 +08: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
2f1a49e335
progs/xdemos: add z/Z keys for scaling the rendering
2010-01-22 08:08:45 -07:00
8bc3c06d86
progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.
2010-01-21 23:24:40 -08:00
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
5e8240320a
Merge remote branch 'origin/opengl-es-v2'
2010-01-20 10:02:15 +08:00
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
8311a49b2d
progs/egl: Pass EGLDisplay to eglCopyBuffers.
...
X Display was wrongly passed to eglCopyBuffers.
2010-01-18 17:07:19 +08: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
8e9ceb8309
progs/xdemos: Remove unnecessary header from corender.c.
2010-01-11 20:24:57 -08: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
ae8ed89f24
progs/tests: Remove duplicate included header in vparray.c.
2010-01-11 19:58:08 -08:00
6ed607cce6
progs/tests: Add newline to end of printf in vparray.c.
2010-01-11 19:56:04 -08:00
7bfa54c6a4
progs/redbook: Remove unnecessary header from aapoly.c.
2010-01-11 19:52:22 -08:00
2178abfba3
progs/glsl: Remove duplicate included header from shtest.c.
2010-01-11 19:42:55 -08:00
78ddce9fda
progs/demos: Remove unnecessary header from morph3d.c.
2010-01-11 19:29:26 -08:00
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
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
562c127693
Merge branch 'master' into opengl-es-v2
...
Conflicts:
src/mesa/main/dd.h
2010-01-12 11:25:02 +08:00
f07e87ffba
progs/tests: Silence fprintf format warning.
2010-01-11 19:16:36 -08:00
b4bc208529
progs/demos: Remove unnecessary header from isosurf.c.
2010-01-11 19:03:18 -08:00
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
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
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
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
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
José Fonseca
Keith Whitwell
Chia-I Wu
Brian Paul
Vinson Lee
Alan Hourihane
Aaron Plattner
Dave Airlie
Dave Airlie
Marcin Slusarz
Jakob Bornecrantz
Jesse Barnes