Commit graph

30036 commits

Author SHA1 Message Date
Brian Paul
ffe4e2a667 mesa: use switch in _mesa_DeletePrograms() 2010-01-22 16:18:56 -07:00
Brian Paul
7b5ad23c7f Merge branch 'mesa_7_7_branch'
Conflicts:

	src/mesa/shader/prog_execute.c
2010-01-22 16:09:03 -07:00
Brian Paul
099e8ec54d mesa: re-implement _mesa_ProgramEnvParameter4fvARB() with memcpy()
This is faster and ensures that NaN floats get stored properly.
Before, NaN values (which might be used with UP2H, UP2US, UP4B and
UP4UB) weren't getting stored properly with gcc -O3.

This is the second part of the fix for the piglit fp-unpack-01 failure
(bug 25973).
2010-01-22 15:41:11 -07:00
Brian Paul
8d1a01d370 mesa: use new fetch_vector1ui() function for 'unpack' GPU instructions
The UP2H, UP2US, UP4B and UP4UB instructions interpret the float
registers as integers.  With gcc -O3 some bits were getting mixed up
somewhere.  This is part of the fix for the piglit fp-unpack-01 test
failure (bug 25973).
2010-01-22 15:36:38 -07:00
Brian Paul
efde2df114 xlib/softpipe: more buffer free fixes
The previous memory leak fix didn't always work properly.
Now check the xm_buffer::smh field (now documented!) to
see if the buffer points to shared memory.
2010-01-22 13:07:07 -07:00
Alan Hourihane
d88b219cf3 Remove obsolete file 2010-01-22 19:33:04 +00:00
Brian Paul
1e4b81267c gallium/aux: re-add pb_buffer_fenced.[ch] accidentally remove during merge 2010-01-22 12:27:25 -07: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
64871747bb gallium/draw: apply DRAW_PIPE_FLAG_MASK to all vertex elements
Depending on first/last provoking vertex either the first or last
element/index may have the extra DRAW_PIPE_x flags.  Mask off those
bits for all vertex elements to be safe (esp. for the quad case).
This may be overly cautious, but it's a cheap operation.

Fixes a segfault caused by large/bogus vertex indexes otherwise.
2010-01-22 11:49:51 -07:00
Brian Paul
5ab0d49a07 gallium/draw: added comments, whitespace fixes 2010-01-22 11:39:19 -07:00
Alan Coopersmith
2b20b60427 mesa: Add "shader/" path to #include statements in shader parser/lexer sources
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

Note sure why the compiler's -I paths aren't doing the job, but this is OK.

Signed-off-by: Brian Paul <brianp@vmware.com>
2010-01-22 10:38:06 -07:00
Brian Paul
e4f168a6f4 glapi: clean-up and simplify glapi_nop.c code
Removed _glapi_noop_enable_warnings() and _glapi_set_warning_func().
Just check the DEBUG env vars and call fprintf(stderr) with a warning
message instead.
2010-01-22 09:56:55 -07:00
Brian Paul
126aff18aa glapi: split the no-op dispatch code into new glapi_nop.c file
This unclutters the glapi.c file a bit.
2010-01-22 09:32:12 -07:00
Brian Paul
ea5918be0e glapi: fix int->pointer conversions warnings in no-op functions 2010-01-22 08:15:14 -07:00
Brian Paul
2f1a49e335 progs/xdemos: add z/Z keys for scaling the rendering 2010-01-22 08:08:45 -07:00
Brian Paul
5023a7f53f gallium/draw: fix-up comments, whitespace 2010-01-22 08:08:45 -07:00
Brian Paul
3c31b1b6d1 gallium/draw: replace int with boolean 2010-01-22 08:08:45 -07:00
Ruediger Oertel
96280c2a41 Fix PowerPC related typo in spantmp2.h
Signed-off-by: Matthias Hopf <mhopf@suse.de>
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-01-22 08:07:41 -07:00
Andre Maasikas
69e26a08c6 r600: enable sampler lod* bits
bits, settings derived from testing, might contain some errors...
2010-01-22 16:57:47 +02:00
Andre Maasikas
70ccca4251 r600: update vport z & clipping when depth_clamp is changed
fixes piglit depth_clamp
2010-01-22 14:14:01 +02:00
Andre Maasikas
9bf40cea00 r600: fix brownbag, only align if we are dealing with cubemap 2010-01-22 13:49:12 +02:00
Andre Maasikas
714d9c21ec r600: cubemap levels seem to be aligned to 8 images 2010-01-22 13:33:15 +02:00
Andre Maasikas
278ad74fe0 radeon/fbo: flush rendering before generating mipmaps
or maybe should flush(also) in finish_render_texture...
2010-01-22 12:58:27 +02:00
Andre Maasikas
7c6f51cdcc radeon/fbo: use correct depth texture offset for depth textures 2010-01-22 12:38:34 +02:00
Andre Maasikas
defd45e95e r600: enable draw_offset
fixes some fbo cases (mipmaps, cube textures ..)
2010-01-22 12:38:19 +02:00
Chia-I Wu
cec2eeb33e docs: Update sourcetree.html for EGL and the state trackers. 2010-01-22 18:10:52 +08:00
Chia-I Wu
3c967a9207 st/egl_g3d: Rename to st/egl.
Simply the name to egl.
2010-01-22 16:45:28 +08:00
Chia-I Wu
3a4b7d3071 winsys/drm: Update the options of mklib in Makefile.egl_g3d.
Pass -linker, -ldflags, and $(MKLIB_OPTIONS) to mklib.
2010-01-22 16:44:13 +08:00
Chia-I Wu
3b0ffd5a36 egl: Remove egl_softpipe.
With the addition egl_x11_swrast, egl_softpipe is sort of deprecated.
The new driver serves the same purpose as egl_softpipe does.  It is
based on egl_g3d and provides more features.
2010-01-22 16:44:13 +08:00
Chia-I Wu
a1306f4ef6 winsys/drm: Add swrast.
The swrast winsys always returns NULL when drm_api_create is called.
2010-01-22 16:44:09 +08:00
José Fonseca
383f460cf7 vmware/core: Update for pipebuffer changes.
In particular, delay patching GMR relocations until the buffers are
validated, since the buffers relative offset can only be established then.
2010-01-22 09:41:52 +01:00
Vinson Lee
3f6d732bfb st/mesa: Remove unnecessary header from st_cb_viewport.c. 2010-01-21 23:41:57 -08:00
Chia-I Wu
52d7b2cede st/egl: Remove the egl state tracker.
The egl_g3d state tracker has support for KMS, and the support is based
on the egl state tracker.  As egl_g3d provides more features, it should
be better to keep only egl_g3d to unify the efforts.
2010-01-22 15:37:56 +08:00
Vinson Lee
8bc3c06d86 progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c. 2010-01-21 23:24:40 -08:00
Chia-I Wu
2a928899e3 egl: Remove USING_EGL and the related drivers.
They do not build for a long while and there seems to be no active
users.  It might be better for them to live in the git histroy.
2010-01-22 15:16:31 +08:00
Chia-I Wu
324fdf7364 egl: Remove the demo driver.
The demo driver has outdated.  It is suggested to look at any of the
drivers that is functioning.
2010-01-22 15:10:09 +08:00
Vinson Lee
a1c5d8f61d i915g: Remove unnecessary header. 2010-01-21 23:09:06 -08:00
Vinson Lee
cea9250ff0 pipebuffer: Remove unnecessary header. 2010-01-21 23:07:29 -08:00
Chia-I Wu
cfb1ed3977 st/egl_g3d: Use glxinit.c from egl_xdri.
It is used to fetch the GLX visuals/fbconfigs.  Use egl_xdri's version
to avoid duplication.  It might be better to rewrite that part though.
2010-01-22 15:06:06 +08:00
Chia-I Wu
29732f982c docs: Update the status of egl_xdri.
Mention that it also supports DRISW.
2010-01-22 15:06:06 +08:00
Chia-I Wu
18b63b55d5 egl_xdri: Add support for DRISW.
Try DRISW if both DRI2 and DRI fail.  It can also be forced by setting
EGL_SOFTWARE.  When DRISW is used, single-buffered modes are ignored.
2010-01-22 15:03:45 +08:00
Vinson Lee
dc544ad9c6 draw: Remove unnecessary headers. 2010-01-21 22:57:12 -08:00
Chia-I Wu
caa75a7ce0 egl_xdri: Flush commands on context switch and buffer swap.
The corresponding DRI functions does not flush for us.
2010-01-22 14:54:41 +08:00
Chia-I Wu
3c9bf648ac egl_xdri: Report only OpenGL support.
It reported OpenGL ES support because some demos did not set
EGL_RENDERABLE_TYPE correctly.  The demos are fixed.
2010-01-22 14:54:40 +08:00
Chia-I Wu
fe0e35aba8 egl_xdri: Do not reinitialize in __glXInitialize.
__glXInitialize should return the same GLX display for the same X
display.  This issue is triggered by
a35f6bb207.
2010-01-22 14:54:40 +08:00
Chia-I Wu
0e54f9c529 egl_glx: Report only OpenGL support.
It reported OpenGL ES support because some demos did not set
EGL_RENDERABLE_TYPE correctly.  The demos are fixed.
2010-01-22 14:24:46 +08:00
Chia-I Wu
2279fa3c06 egl: Update driver Makefiles.
Update to use the new Makefile.template.
2010-01-22 13:29:23 +08:00
Chia-I Wu
e63272050f egl: Add Makefile.template for EGL drivers. 2010-01-22 12:02:00 +08:00
Chia-I Wu
883b57e66c winsys/drm: Update Makefile.template.
Mainly to respect LDFLAGS and remove unused target $(LIBNAME_EGL).  This
is based on the patch by Tomáš Chvátal <scarabeus@gentoo.org>.
2010-01-22 11:28:48 +08:00
Vinson Lee
e8b5203fbb svga: Remove unused variable. 2010-01-21 17:24:07 -08:00