Commit graph

32172 commits

Author SHA1 Message Date
Marc
8f2100b48e r600: fix warnings
(cherry picked from commit 5552dffa39)
2010-08-03 12:03:58 -06:00
Henri Verbeet
27bbb68dfb r600: Make next_inst() static.
(cherry picked from commit 8744c36ea4)
2010-08-03 12:03:58 -06:00
Henri Verbeet
c3cc7d4033 r600: Assert output registers have a valid export index.
(cherry picked from commit 1bf75a921b)
2010-08-03 12:03:58 -06:00
Henri Verbeet
47a2046a08 r600: Process exports for all written fragment outputs.
(cherry picked from commit 1ec492a366)
2010-08-03 12:03:58 -06:00
Henri Verbeet
f3724c830c r600: Fill uiFP_OutputMap for all written fragment outputs.
(cherry picked from commit 1f7bc87391)
2010-08-03 12:03:58 -06:00
Andre Maasikas
bedecdff1f r600: enable VERT_RESULT_PSIZ - makes point size & attenuation work
doc additions: shader export ARRAY_BASE for EXPORT_POS: 60 is position,
61 is misc vec(VS_OUT_MISC_VEC - used here),
62, 63 are clip distance vectors(VS_OUT_CCDIST#)

sorry for formating - there seem to be so many different styles in r600
(cherry picked from commit 12172071b5)
2010-08-03 12:03:57 -06:00
Andre Maasikas
43f332e6fc r600: adjust point sprites after 911fa4a4a1
there's no more vp results for point coords so we cannot iterate
over vp outputs. Use only Point.CoordReplace[i]
(cherry picked from commit 04a148629f)
2010-08-03 12:03:57 -06:00
Brian Paul
12df872f8c mesa: return retval in _mesa_RenderObjectUnpurgeable()
Found by Vinson with static analysis.

NOTE: This is a candidate for the 7.8 branch.
(cherry picked from commit 41bcd8cb1e)
2010-08-03 12:03:56 -06:00
Alex Deucher
0d3ac51bf2 r600: fix typo in r700 assembler
Noticed by Henri Verbeet on IRC.

NOTE: This is a candidate for the 7.8 branch.
(cherry picked from commit 2bd69080a2)
2010-08-03 12:03:55 -06:00
Henri Verbeet
9cad102121 radeon: Also flush if it's not the current context that's being destroyed.
This avoids calling radeonFlush() during context destruction, when
ctx->DrawBuffer would be NULL.

NOTE: This is a candidate for the 7.8 branch.
(cherry picked from commit fef9b532cd)
2010-08-03 12:03:55 -06:00
Alex Deucher
66ad60399a radeon: allow driconf vblank settings with dri2
fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28771

NOTE: This is a candidate for the 7.8 branch.
(cherry picked from commit 0a7803cbac)
2010-08-03 12:03:55 -06:00
Brian Paul
7f31029471 mesa: fix _mesa_Texture/Render/BufferObjectUnpurgeable() return values
Fixes piglit object_purgeable-api-pbo, object_purgeable-api-vbo
and object_purgeable-api-texture failures with swrast.

NOTE: This is a candidate for the 7.8 branch.
(cherry picked from commit 2f4ce25645)
2010-08-03 12:03:55 -06:00
Maciej Cencora
7b706cc69b radeon: lower texture memory consumption is some cases
When searching for valid miptree check images in range
of [BaseLeve, MaxLevel] not [MinLod, MaxLoad].
Prevents unnecessary miptree allocations in cases when during
every rendering operation different texture image level
was selected using MIN_LOD = MAX_LOD = level (for every level
new miptree for whole texture was allocated).

Candidate for 7.8 branch.

Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
(cherry picked from commit 72e6a1e72f)
2010-08-03 12:03:54 -06:00
Maciej Cencora
69088d5484 radeon: fix teximage migration failure in rare case
Always store selected miptree in texObj->mt so get_base_teximage_offset returns correct data.
Found with piglit/mipmap-setup.

Candidate for 7.8 branch.

Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
(cherry picked from commit ad24ea37bb)
2010-08-03 12:03:54 -06:00
Maciej Cencora
8cb6b198d2 r300c: Fix vertex data setup for named buffer objects with unaligned offset
Candidate for 7.8 branch

Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
(cherry picked from commit 452a7d5a9d)
2010-08-03 12:03:54 -06:00
Brian Paul
ac82d16021 osmesa: remove old renderbuffer before adding new
Fixes fd.o bug 10966 when OSMesaMakeCurrent() was called twice.

NOTE: This is a candidate for the 7.8 branch.
(cherry picked from commit 91c37599f6)
2010-08-03 12:03:53 -06:00
Brian Paul
f02cd9030c mesa: initialize extension string when context is first bound
...instead of waiting until glGetString(GL_EXTENSIONS) is called.
This fixes a problem where the MESA_EXTENSION_OVERRIDE env var is
ignored if the app never calls glGetString(GL_EXTENSIONS).

NOTE: this is a candidate patch for the 7.8 branch.
(cherry picked from commit a879d14ecf)
2010-08-03 12:03:53 -06:00
Tim Evans
74959ed201 swrast: fix incorrect specular highlights on backfaces
See bug 28577 for details.
NOTE: this is a candidate for the 7.8 branch.

Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 64e32ffb6e)
2010-08-03 12:03:53 -06:00
Chia-I Wu
d06e0117e3 st/egl: Fix build on FreeBSD.
There is no libdl on FreeBSD.  Based on patch from Thinker
<thinker@branda.to>, which is against 7.8.

This fixes fdo bug #29093.
(cherry picked from commit 08f4bc07e4)
2010-07-16 20:24:35 +08:00
Tom Stellard
b69d5414aa r300/compiler: Fix scheduling of TEX instructions.
The following instruction sequence will no longer be emitted in separate
TEX blocks:

0: TEX temp[0].xyz, temp[1].xy__, 2D[0];
1: TEX temp[1].xyz, temp[2].xy__, 2D[0];

This fixes fdo bug #25109
(cherry picked from commit 3724a2e65f)
2010-07-08 22:46:56 -07:00
Chia-I Wu
f6bba7b996 st/egl: Add support for !GLX_DIRECT_RENDERING.
st/egl uses GLX code for DRI2 support.  It should honor
GLX_DIRECT_RENDERING.

Also updates configure.ac to define GLX_DIRECT_RENDERING for st/egl.
(cherry picked from commit cf588ab3f1)
2010-07-06 15:45:27 +08:00
Brian Paul
6afe2936f7 mesa: put progs/util into the MesaDemos package 2010-07-05 16:50:24 -06:00
Dan Nicholson
fd95ea52e5 Use GLW_CFLAGS when building libGLw
We check for libX11 and libXt, so we might as well use the CFLAGS
pkg-config tells us about.
(cherry picked from commit 442c37e2ef)

Conflicts:

	configs/autoconf.in
2010-07-01 13:02:47 -07:00
Dan Nicholson
31799da47f Use GLUT_CFLAGS when building glut
Fix this build error (in MesaGLUT-7.6.1)...
glut_cmap.c:23:66: error: X11/Xmu/StdCmap.h: No such file or directory

...by not preventing the cflags that pkg-config finds for glut dependencies
(including 'xmu') from being used.

Defining GLUT_CFLAGS before running the pkg-config prevents the
cflags found by pkg-config from being used.

This patch lets GLUT_CFLAGS that configure & pkg-config work
so hard to set actually get used.

Also make sure the generated configs/autoconf defines GLUT_CFLAGS
used in (at least) src/glut/glx/Makefile.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit 9617254a1e)

Conflicts:

	configs/autoconf.in
2010-07-01 13:02:09 -07:00
Brian Paul
078d04ed81 docs: remove redundant changes section 2010-06-21 16:21:19 -06:00
Ian Romanick
a2782af384 docs: Add 7.8.2 release MD5 sums 2010-06-16 14:39:34 -07:00
Ian Romanick
b12692404c docs: added news item for 7.8.2 release 2010-06-16 14:30:14 -07:00
Ian Romanick
43becf60f8 mesa: set version string to 7.8.2 2010-06-16 14:29:46 -07:00
Ian Romanick
c19bc5de96 docs: Update mailing lines from sf.net to freedesktop.org 2010-06-16 14:28:08 -07:00
Ian Romanick
41e371e351 docs: download.html does not need to be updated for each release 2010-06-16 14:24:46 -07:00
Ian Romanick
7b86b24808 docs: Many updates to 7.8.2 release notes 2010-06-16 14:16:39 -07:00
Dan Nicholson
6e0c3a1ba0 docs: Note OSMesa build fix 2010-06-16 12:12:39 -07:00
Dan Nicholson
843a02eb9b osmesa: always build standalone for internal symbols
When building OSMesa and xlib GL, the resulting OSMesa would be linked
against libGL instead of the internal mesa libraries. However, when
building with -fvisibility=hidden, some of the internal functions used
in OSMesa could not be resolved through libGL.

Instead, always build OSMesa standalone without linking against libGL.
This has the advantage that OSMesa is always built the same way, but it
means that disk space is wasted when libGL is installed since both
libraries will contain the internal objects.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Tom Fogal <tfogal@alumni.unh.edu>
(cherry picked from commit cbf30fce32)
2010-06-16 09:29:44 -07:00
Eric Anholt
8825d5ca54 docs: Update to note 830/845 hang fix. 2010-06-15 15:54:31 -07:00
Eric Anholt
226e612631 i915: Clamp minimum lod to maximum texture level too.
Otherwise, we'd run into minlod > maxlod, and the sampler would give
us the undefined we asked for.

Bug #24846.  Fixes OGLC texlod.c.
(cherry picked from commit b80a728f8a)
2010-06-15 15:53:02 -07:00
Eric Anholt
3e9f4d19f6 i965: Fix bit allocation for number of color regions for ARB_draw_buffers.
If you used all 4 color targets we currently support, we would see 0
and end up just writing the first output.  Give enough bits that we
can do the maximum of 16.

Fixes piglit fbo-drawbuffers-maxtargets.
(cherry picked from commit 08b42bc97d)
2010-06-15 15:53:02 -07:00
Eric Anholt
37a8fa74c3 i965: Set the correct provoking vertex for clipped first-mode trifans.
Bug #24470: glean clipFlat test.
(cherry picked from commit 4e84dc8729)
2010-06-15 15:53:02 -07:00
Eric Anholt
eb99b66737 i965: Use R16G16B16A16_FLOAT for 3-component half-float.
The RGBX version isn't supported as a vertex input type, but since we
force the last channel's value anyway, this should be fine.  The only
potential risk I see is in the limiter on VBO reads past the end of
the buffer forcing the whole vertex to 0 when the A channel lands past
the end.

Fixes piglit draw-vertices-half-float.
(cherry picked from commit f5bd48cf67)
2010-06-15 15:53:01 -07:00
Eric Anholt
fc0b912f1e i915: Don't use XRGB8888 on 830 and 845.
The support for XRGB8888 appeared in the 855 and 865, and this format
is reserved on 830/845.  This should fix a regression from
b4a6169412 that caused hangs in etracer
on 845s.

Bug #26557.
(cherry picked from commit f0ff214bee)
2010-06-15 15:53:01 -07:00
Chris Wilson
a48edfad8a i915: Fix off-by-one for drawing rectangle.
The drawing rectangle is given in *inclusive* pixel values, so the range
is only [0,2047]. Hence when rendering to a 2048 wide target, such as an
extended desktop, we would issue an illegal instruction zeroing the draw
area.

Fixes:

  Bug 27408: Primary and Secondary display blanks in extended
             desktop mode with Compiz enabled
  https://bugs.freedesktop.org/show_bug.cgi?id=27408

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit add3260157)
Reviewed-by: Eric Anholt <eric@anholt.net>
2010-06-13 21:05:27 +01:00
Brian Paul
1f756d916a docs: added a few more bug fixes to the 7.8.2 relnotes file 2010-06-08 08:45:08 -06:00
Brian Paul
7dbfc2565e glsl: change uniform location/offset encoding
This lets Mesa work like other OpenGL implementations with regard
to indexing uniform arrays.  See comments for details.

This is a combination of commits 5d0e136eff
and 1bbf803e3b from master which didn't
apply cleanly with git cherry-pick.
2010-06-08 08:43:37 -06:00
Brian Paul
d2f2d0a1b7 glx: fix regression with GLX_USE_GL
update for fbconfig_style_tags

Based on commit 26a9b7e4c7 from master.
But fix the formatting and don't dereference the pointer to avoid a
compiler warning.
2010-06-02 16:01:17 -06:00
Marek Olšák
fadc3c5c06 st/mesa: fix per-vertex point size
Cherry-picked from master, commit 0ad541a684.
2010-05-27 21:25:13 +02:00
Brian Paul
011e7b2c96 mesa: fix incorrect GL_DEPTH_STENCIL_ATTACHMENT format check
We want to check the incoming renderbuffer format, not the (potentially
non-existant) current attachment.

Fixes segfault w/ fbotexture -ds2.

NOTE: this will be applied to the 7.8 branch too.

(cherry picked from commit a504f2387e)
2010-05-27 13:14:40 -06:00
Brian Paul
2eb5bc5add meta: Convert Z value from normalized to object-space in meta code
Convert Z from a normalized value in the range [0, 1] to an
object-space Z coordinate in [-1, +1] so that drawing at the new Z
position with the default/identity ortho projection results in the
original Z value.  Used by the meta-Clear, Draw/CopyPixels and Bitmap
functions where the Z value comes from the clear value or raster
position.

Fixes piglit tests fdo23670-depth_test, quad-invariance and
glsl-orangebook-ch06-bump as well as oglc zbfunc.c.

https://bugs.freedesktop.org/show_bug.cgi?id=23670
2010-05-24 17:24:38 -04:00
Brian Paul
7d313d3506 docs: update 7.8.2 relnotes with Cell driver fixes
(cherry picked from commit b7f8f176f1)
2010-05-21 09:52:05 -06:00
Brian Paul
5c54b54e00 cell: fix breakage from earlier draw module changes
(cherry picked from commit 6e0efad38b)
2010-05-21 09:49:08 -06:00
Brian Paul
433626e5c0 cell: remove unused var 2010-05-21 09:27:39 -06:00
Brian Paul
b4777f82d5 gallium/draw: fix function parameter warning 2010-05-21 09:27:24 -06:00