Commit graph

28045 commits

Author SHA1 Message Date
Andre Maasikas
0d4a05445c Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 2009-12-08 10:16:14 +02:00
Andre Maasikas
369669ff9a r600: add support for TXB instruction
makes testing other things easier - does not hang the card
TODO: enable TEX dependency tracking in vertex programs
2009-12-08 10:02:23 +02:00
Andre Maasikas
dc0777d3e3 r600: reorder state for render_target and blend
First time around render targets are not enabled yet (done in
r700SendRenderTargetState) so blend state is not emitted for any targets.
Affects first glClear in some mesa tests.
As a quick fix reorder state emit so that target is set first
2009-12-08 09:41:10 +02:00
Vinson Lee
add6dfbba6 llvmpipe: Initialize variables in emit_instruction. 2009-12-07 19:04:07 -08:00
Vinson Lee
3e8b2fda21 progs/test: Initialize variable in prog_parameter.
Silences uninitialized variable compiler warning.
2009-12-07 18:40:37 -08:00
Ian Romanick
ba167f812c mesa: set version string to 7.7-rc1
Also modify the Makefile to use the correct version for the tarballs.
2009-12-07 17:18:56 -08:00
Ian Romanick
8fc433fa0f Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
	progs/demos/projtex.c
	progs/xdemos/glxinfo.c
	src/mesa/main/version.h

To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch.  The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
2009-12-07 17:16:10 -08:00
Ian Romanick
bb64c9bcdf Revert "intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers."
This reverts commit 4598942b1b.

XRGB8888 doesn't work as intended.  Revert this for now, and we'll revisit it
for 7.8 or something.
2009-12-07 17:06:07 -08:00
Ian Romanick
9dbd47fc6b mesa: set version string to 7.6.1-rc3 2009-12-07 16:59:59 -08:00
Maciej Cencora
9921b3048e radeon: fix cases when only first image where put directly into miptree.
Make sure that minimal width, height and depth of texture image is 1.
2009-12-07 22:33:11 +01:00
Maciej Cencora
013cf1d63d radeon: fix image migration for small compressed textures
memcpy would give incorrect results if src rowstride != dst rowstride
2009-12-07 22:29:11 +01:00
Vinson Lee
7d84169865 progs/demos: Fix memory leak in projtex.c. 2009-12-07 12:31:08 -08:00
Vinson Lee
7005f7cd1a st/egl: Fix memory leak in egl_tracker.c.
(cherry picked from commit 052b127842)
2009-12-06 01:15:24 -08:00
Vinson Lee
c994f08eb1 dri: Fix potential null pointer dereference in driBindContext.
(cherry picked from commit 919898e92f)
2009-12-06 01:01:55 -08:00
Vinson Lee
f622b649fb dri: Fix potential null pointer deference in dri_put_drawable.
(cherry picked from commit 364070b1f2)
2009-12-06 01:00:20 -08:00
Vinson Lee
76b3523d75 glx: Prevent potential null pointer deference in driCreateContext.
(cherry picked from commit 4b0b250aae)
2009-12-06 00:56:20 -08:00
Vinson Lee
978b80c8e3 progs/tests: Add tests to Makefile.
(cherry picked from commit 76d2ec3a0a)
2009-12-05 21:20:54 -08:00
Vinson Lee
3cd745515e draw: Initialize variable in draw_pt.c.
(cherry picked from commit ea98e9820d)
2009-12-05 15:11:41 -08:00
Vinson Lee
b2953ee1a6 mesa: Fix array out-of-bounds access by _mesa_TexGenf.
_mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument
as an array.
(cherry picked from commit ca5a7aadb4)
2009-12-05 13:00:35 -08:00
Vinson Lee
d74cd04e61 mesa: Fix array out-of-bounds access by _mesa_TexGeni.
_mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument
as an array.
(cherry picked from commit d55fb7c835)
2009-12-05 12:59:34 -08:00
Vinson Lee
ca8a2150c7 mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
(cherry picked from commit 270d36da14)
2009-12-05 12:50:56 -08:00
Vinson Lee
4071d065c2 mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.
(cherry picked from commit a201dfb6bf)
2009-12-05 12:47:40 -08:00
Vinson Lee
1446f30875 progs/samples: Fix memory leak if malloc fails in rgbtoppm.c. 2009-12-05 01:43:29 -08:00
Vinson Lee
412aeeed1c progs/samples: Fix memory leak if fopen fails in rgbtoppm.c. 2009-12-05 01:38:14 -08:00
Vinson Lee
6212c8103a progs/samples: Add rgbtoppm to Makefile. 2009-12-05 01:28:47 -08:00
Vinson Lee
2cd2341ce8 progs/tests: Removed unused variable from texdown.c. 2009-12-05 01:23:05 -08:00
Vinson Lee
d642edd2d1 progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.
The return type of glGetUniformLocationARB is GLint, not GLuint.
2009-12-05 01:11:26 -08:00
Vinson Lee
8d2f3434c5 progs/fp: Redraw upon keypress. 2009-12-04 23:31:39 -08:00
Vinson Lee
fe8e18bcd4 mesa: Fix array out-of-bounds access in _mesa_TexEnvf.
_mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument
as an array.
(cherry picked from commit a11d60d14c)
2009-12-04 17:48:30 -08:00
Vinson Lee
4fb5ae7233 progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
(cherry picked from commit 11905da883)
2009-12-04 17:35:00 -08:00
Vinson Lee
5683d7d43f progs/util: Fix memory leak if fail to load/compile shader
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit c475079ef2)
2009-12-04 17:32:48 -08:00
Vinson Lee
e5bc2a19bd progs/fp: Add tri-inv.c to Makefile. 2009-12-04 17:29:53 -08:00
Coleman Kane
225bc70b77 r300g: use $(MAKE) variable
Fixes bug 24501
2009-12-04 08:45:04 -07:00
Brian Paul
ca7cd3ade0 progs/xdemos: fix some visual/fbconfig logic in glxinfo.c
The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values.
We only need to use the glXChooseFBConfig() code when glXChooseVisual()
fails (but I don't know when that would happen).
Other recent commits errantly removed some code in this area too.
2009-12-04 08:09:57 -07:00
Brian Paul
fb83fa26c4 docs: a few more fixes for 7.6.1 2009-12-04 08:09:07 -07:00
Alex Deucher
8d8fd9776e radeon: fix polygon stipple
fixes fdo bug 25354

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-12-04 09:52:37 -05:00
Jakob Bornecrantz
1ef8c493b2 vmware/xorg: Use Write instead of WriteRead for cursor bypass 2009-12-04 10:33:34 +01:00
Jakob Bornecrantz
cd4d806a47 vmware/xorg: Give kernel infromation about cursor bypass 2009-12-04 09:54:51 +01:00
Jakob Bornecrantz
12fdef20b0 vmware/xorg: Handle no init of video in vmw_video_close 2009-12-04 09:54:50 +01:00
Jakob Bornecrantz
47e128331a vmware/core: Update vmwgfx_drm.h to include cursor bypass 2009-12-04 09:54:50 +01:00
Jakob Bornecrantz
bc0532b0ed gallium: DRI drivers enabled by default, Xorg drivers auto by default.
This change enabled gallium dri drivers by default under the
configure build system. Xorg drivers are built automaticaly
if a Xorg dev enviroment is installed and the Xorg version
is higher then 1.6.0.
2009-12-04 19:02:41 +00:00
Jakob Bornecrantz
8ac2503397 i915g: Do not build winsys and binaries by default
Using a hack in the configure script the gallium intel
drivers have 3 options. Off, nothing is built. On, the
driver and binaries are built. Auto, only the driver but
not the binaries and winsys is built.

Since the i915g driver builds everywhere its can enable
the driver per default, so we can get build coverage.
But building the binaries per default is a pain for
distributions and testers since they conflict on the
install target with the old mesa drivers. Which are more
stable/faster/better.

So this change gives us the best of both worlds.
2009-12-04 16:01:41 +00:00
Vinson Lee
c74afe0c46 glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.
(cherry picked from commit 808f037660)
2009-12-04 00:14:31 -08:00
Vinson Lee
8df551c46b glu/sgi: Fix memory leak in gluBuild1DMipmapLevelsCore.
(cherry picked from commit 94bcb9f1a4)
2009-12-04 00:14:05 -08:00
Vinson Lee
ea487c6d0b glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.
(cherry picked from commit 0d89f3dc7f)
2009-12-04 00:13:25 -08:00
Vinson Lee
7b5eba453e glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore.
(cherry picked from commit f895abbd97)
2009-12-04 00:12:49 -08:00
Vinson Lee
7ed749c062 glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore.
(cherry picked from commit 326b66d724)
2009-12-04 00:11:58 -08:00
Vinson Lee
80a3944a4d glu/sgi: Fix memory leak in bitmapBuild2DMipmaps.
(cherry picked from commit 5b925b7daa)
2009-12-04 00:11:02 -08:00
Vinson Lee
6c1fc2b2a5 glu/sgi: Fix memory leak in gluScaleImage3D.
(cherry picked from commit b611f639b4)
2009-12-04 00:10:22 -08:00
Vinson Lee
fe38c16021 glu/sgi: Fix memory leak in gluScaleImage.
(cherry picked from commit a9c540f5de)
2009-12-04 00:09:22 -08:00