11 years agost/mesa: fix glCopyPixels bugs/crashes when src region need clipping
Brian Paul [Wed, 17 Mar 2010 16:06:27 +0000 (10:06 -0600)]
st/mesa: fix glCopyPixels bugs/crashes when src region need clipping

Use the _mesa_clip_readpixels() function to clip the src region against
the buffer's bounds.  Neatly, the resulting pixel unpack object's
SkipPixels/SkipRows fields can be used to determine the position of the
region in the destination texture.

Fixes crash in progs/samples/copy.c and probably other cases.

11 years agomesa: rename params in prototype to match implementation
Brian Paul [Wed, 17 Mar 2010 15:04:26 +0000 (09:04 -0600)]
mesa: rename params in prototype to match implementation

11 years agoswrast: remove unused compute_coveragei() function
Brian Paul [Wed, 17 Mar 2010 14:41:47 +0000 (08:41 -0600)]
swrast: remove unused compute_coveragei() function

11 years agoi965: Fix ENDLOOP to only patch up this loop's BREAK and CONT.
Eric Anholt [Tue, 9 Mar 2010 22:22:51 +0000 (14:22 -0800)]
i965: Fix ENDLOOP to only patch up this loop's BREAK and CONT.

Corresponds to d225a25e21a24508aea3b877c78beb35502e942d and fixes
piglit glsl-fs-loop-nested.  Bug #25173.
(cherry picked from commit a81836ee2fe5092d695b717addf8cec91f569777)

11 years agoi965: Unalias all GLSL source regs from the destination regs used.
Eric Anholt [Tue, 9 Mar 2010 19:56:14 +0000 (11:56 -0800)]
i965: Unalias all GLSL source regs from the destination regs used.

We were doing it ad-hoc before, as instructions with potential
aliasing problems were identified.  But thanks to swizzling basically
anything can have aliasing, so just do it generally at source reg
setup time.  This is somewhat inefficient, because sometimes an
operation doesn't need unaliasing protection if the swizzling is safe,
but the unaliasing before didn't cover those cases either.

Fixes piglit glsl-fs-loop.
(cherry picked from commit 6b194dab6b4d9f12cdd54c699b23c0d3420a49c2)

11 years agoi965: Fix nested loops in the VS.
Eric Anholt [Tue, 9 Mar 2010 17:56:42 +0000 (09:56 -0800)]
i965: Fix nested loops in the VS.

We were patching up all the break and continues between the start of
our loop and the end of our loop, even if they were breaks/continues
for an inner loop.  Avoiding patching already patched breaks/continues
fixes piglit glsl-vs-loop-nested.
(cherry picked from commit f6f547d87ea68f44c50a0b0231b7360ca94b2975)

11 years agoi965: Fix up VP constbuf leak on program delete.
Eric Anholt [Tue, 9 Mar 2010 00:08:33 +0000 (16:08 -0800)]
i965: Fix up VP constbuf leak on program delete.
(cherry picked from commit 7f6d2754d586545ab6c970acffdd897294879039)

11 years agoi965: Fix up the handling of point sprite coordinate replacement.
Eric Anholt [Mon, 8 Mar 2010 20:12:31 +0000 (12:12 -0800)]
i965: Fix up the handling of point sprite coordinate replacement.

The code was walking over the regs of pairs of attributes and checking
whether the attribute with a given reg index had point sprite enabled.
So the point sprite setup code was rarely even getting executed.
Instead, we need to determine which channels of a reg need point
sprite coordinate replacement.  In addition, it was multiplying the
attribute by 1/w, when it's supposed to cover (0, 1) in each direction
regardless of w, and it wasn't filling in the Z and W components of
the texcoord as specified.

Fixes piglit point-sprite and the spriteblast demo.  Bug #24431, #22245.
(cherry picked from commit bc632d04370566c1156cbd0345fe303834f0b910)

11 years agoi965: Add support for the CMP opcode in the GLSL path.
Eric Anholt [Wed, 10 Mar 2010 19:00:40 +0000 (11:00 -0800)]
i965: Add support for the CMP opcode in the GLSL path.

This would be triggered by use of sqrt() along with control flow.
Fixes piglit-fs-sqrt-branch and a bug in Yo Frankie!.
(cherry picked from commit 48dca99feb394febc3af44e14f23fb12a9cc9204)

11 years agoi965: Fix the response len of masked sampler messages for 8-wide dispatch.
Eric Anholt [Wed, 10 Mar 2010 18:38:20 +0000 (10:38 -0800)]
i965: Fix the response len of masked sampler messages for 8-wide dispatch.

The bad response length would hang the GPU with a masked sample in a
shader using control flow.  For 8-wide, the response length is always
4, and masked slots are just not written to.  brw_wm_glsl.c already
allocates registers in the right locations.

Fixes piglit glsl-fs-bug25902 (fd.o bug #25902).
(cherry picked from commit f6d210c284751ac50a8d6358de7e75a1ff1e4ac7)
(cherry picked from commit dc8c0359448cdae7b367552ba58783c04b199778)

11 years agoRemove nonexistant files from tarballs rule of Makefile
Ian Romanick [Tue, 16 Mar 2010 14:48:14 +0000 (07:48 -0700)]
Remove nonexistant files from tarballs rule of Makefile

The Makefile should eventually be fixed to stop building tarballs if
one of the individual calls to tar fails.

11 years agomesa: set version string to 7.8-rc1
Ian Romanick [Tue, 16 Mar 2010 14:38:51 +0000 (07:38 -0700)]
mesa: set version string to 7.8-rc1

11 years agoCorrect GL_EQUIV code in r67/7xx.
Matthew W. S. Bell [Mon, 15 Mar 2010 01:18:02 +0000 (01:18 +0000)]
Correct GL_EQUIV code in r67/7xx.

From 247e121106e8d3e389f2e5a6edf13ea70ac18df7 Mon Sep 17 00:00:00 2001

These seem to be documented in

11 years agoradeon: Fix buffer object unmap to be called only once for dma buffers.
Pauli Nieminen [Mon, 15 Mar 2010 08:30:18 +0000 (10:30 +0200)]
radeon: Fix buffer object unmap to be called only once for dma buffers.

If flush happens inside radeonRefillCurrentMaRegion the last dma buffer would
be unmapped twice. Unmapping buffer when moving buffer to wait list fixes the
mapping error.

11 years agoReplace _mesa_strtod with _mesa_strtof.
Marcin Baczyński [Sat, 13 Mar 2010 13:26:45 +0000 (14:26 +0100)]
Replace _mesa_strtod with _mesa_strtof.

Reviewed-by: Ian Romanick <>
11 years agomesa: Fix memory leak in decompress-with-blit.
Keith Whitwell [Fri, 12 Mar 2010 18:32:10 +0000 (18:32 +0000)]
mesa: Fix memory leak in decompress-with-blit.
(cherry picked from commit f05a4ee6f2840590c90da4be2fe5c6295410a5af)

11 years agovmwgfx/dri: Fix SCons build.
Michel Dänzer [Fri, 12 Mar 2010 17:54:23 +0000 (18:54 +0100)]
vmwgfx/dri: Fix SCons build.

11 years agost/dri: Always try to set up R5G6B5 configs.
Michel Dänzer [Fri, 12 Mar 2010 17:24:34 +0000 (18:24 +0100)]
st/dri: Always try to set up R5G6B5 configs.

Allows compiz to work in depth 16.

The DRI2 getBuffersWithFormat hook is only required for 16/32 bit depth
buffers, for colour buffers the only requirement is that the format matches
the drawable depth, which we can't check here.

(cherry picked from commit c50477c255a34444720fb944c54373462ef39fb9)

11 years agodri/r700: include shader/programopt.h instead of programopt.c.
Luc Verhaegen [Fri, 12 Mar 2010 07:35:22 +0000 (08:35 +0100)]
dri/r700: include shader/programopt.h instead of programopt.c.

Signed-off-by: Brian Paul <>
11 years agoAdd programs to .gitignore in redbook
Jeff Smith [Fri, 12 Mar 2010 02:19:49 +0000 (20:19 -0600)]
Add programs to .gitignore in redbook

Signed-off-by: Jeff Smith <>
Signed-off-by: Brian Paul <>
11 years agoAdd programs to .gitignore in xdemos
Jeff Smith [Fri, 2 Mar 2007 06:14:48 +0000 (00:14 -0600)]
Add programs to .gitignore in xdemos

Signed-off-by: Jeff Smith <>
Signed-off-by: Brian Paul <>
11 years agoAdd -L$(libdir) for xdemos and egl so that the right libX11 is found
Jeff Smith [Tue, 9 Mar 2010 18:40:44 +0000 (12:40 -0600)]
Add -L$(libdir) for xdemos and egl so that the right libX11 is found

Signed-off-by: Jeff Smith <>
Signed-off-by: Brian Paul <>
11 years agoGrammar and spelling fixes
Jeff Smith [Fri, 13 Jun 2008 14:50:43 +0000 (09:50 -0500)]
Grammar and spelling fixes

Signed-off-by: Jeff Smith <>
Signed-off-by: Brian Paul <>
11 years agoradeon: Fix memory leaks from early return.
Vinson Lee [Fri, 12 Mar 2010 05:55:44 +0000 (21:55 -0800)]
radeon: Fix memory leaks from early return.

11 years agost/mesa: s/BUFFER_FRONT_LEFT/surfIndex/
Brian Paul [Thu, 11 Mar 2010 21:51:02 +0000 (14:51 -0700)]
st/mesa: s/BUFFER_FRONT_LEFT/surfIndex/

11 years agost/mesa: fix st_set_framebuffer_surface() state validation
Brian Paul [Thu, 11 Mar 2010 20:44:39 +0000 (13:44 -0700)]
st/mesa: fix st_set_framebuffer_surface() state validation

Set the _NEW_BUFFERS flag and remove the code which updated the
parent framebuffer size.  Normal Mesa state validation will do that.

Fixes issues with Warsow on r300g and possibly other bugs.

11 years agost/xorg: Fixup configure
Jakob Bornecrantz [Thu, 11 Mar 2010 19:23:15 +0000 (19:23 +0000)]
st/xorg: Fixup configure

Make sure we always test for XEXT version.
Make sure that the user has a recent version of libkms and libdrm installed.

Note that the st/xorg code requires so new versions to work but these are
needed to make a proper driver which is the only real user.

Cherry picked from 46cf606cd35d6740b28fd26bd32dbdfdde2c7833

11 years agoARB prog parser: added (float) casts and regenerate files
Brian Paul [Thu, 11 Mar 2010 16:08:58 +0000 (09:08 -0700)]
ARB prog parser: added (float) casts and regenerate files

11 years agost/xorg: Include cursorstr.h
Jakob Bornecrantz [Sat, 6 Feb 2010 16:58:32 +0000 (16:58 +0000)]
st/xorg: Include cursorstr.h

11 years agowindows: fix compilation errors and warnings
Karl Schultz [Wed, 10 Mar 2010 22:58:10 +0000 (15:58 -0700)]
windows: fix compilation errors and warnings

11 years agowindows: Quiet warning by not defining YY_NO_UNISTD_H.
Karl Schultz [Wed, 10 Mar 2010 21:27:34 +0000 (14:27 -0700)]
windows: Quiet warning by not defining YY_NO_UNISTD_H.

11 years agost/mesa: fix incorrect glCopyPixels between window/FBO
Brian Paul [Wed, 10 Mar 2010 17:42:22 +0000 (10:42 -0700)]
st/mesa: fix incorrect glCopyPixels between window/FBO

There was a DrawBuffer/ReadBuffer typo and we were neglecting to invert
the texture coords when copying from a window to an FBO.

Plus, add some surface dump/debug code (disabled).

(cherry picked from commit 34f02071618624263eba839b5aeb930d0e794078)

11 years agost/mesa: fix incorrect glDrawPixels into FBO
Brian Paul [Wed, 10 Mar 2010 17:41:22 +0000 (10:41 -0700)]
st/mesa: fix incorrect glDrawPixels into FBO

We weren't inverting the textured quad when drawing into an fbo.

(cherry picked from commit 8d3f629a13afb0d6acafc7a007972fdc5efe6847)

11 years agost/xorg: Work around cursor reference counting bugs in older X servers.
Michel Dänzer [Wed, 10 Mar 2010 17:26:25 +0000 (18:26 +0100)]
st/xorg: Work around cursor reference counting bugs in older X servers.

Could result in use of freed memory and consequently random crashes, e.g. on
screen resize.
(cherry picked from commit 21c91b410a2a2cbf8eb677e59e3322f86320f2b0)



11 years agoradeon: don't attempt to use alternate blit formats for depth buffers
Alex Deucher [Mon, 8 Mar 2010 22:38:39 +0000 (17:38 -0500)]
radeon: don't attempt to use alternate blit formats for depth buffers

noticed by fredrikh on IRC.

11 years agosoftpipe: zero-out entire clear_flags array in sp_tile_cache_flush_clear()
Brian Paul [Mon, 8 Mar 2010 18:34:55 +0000 (11:34 -0700)]
softpipe: zero-out entire clear_flags array in sp_tile_cache_flush_clear()

Before, we only cleared the flags for the active tiles (the ones inside
the framebuffer bound).  The problem is if we later bound a different,
larger surface to the tile cache we'd have some stale clear-flags still
set (and mistakenly clear some tiles in the new surface).

Fixes fd.o bug 26932.

11 years agost/mesa: don't detach renderbuffer, surface in st_finish_render_texture()
Brian Paul [Mon, 8 Mar 2010 18:31:23 +0000 (11:31 -0700)]
st/mesa: don't detach renderbuffer, surface in st_finish_render_texture()

There's no reason to release the renderbuffer from the framebuffer object
or release the gallium surface in this function (they're reference counted).
In fact, we don't want to do this because we may later use the texture as a
pixel source (ex: glBlitFramebuffer) and need the surface.

Fixes fd.o bug 26923 and is part of the fix for bug 26932.

11 years agor600: enable GL_ARB_pixel_buffer_object
Alex Deucher [Mon, 8 Mar 2010 16:59:02 +0000 (11:59 -0500)]
r600: enable GL_ARB_pixel_buffer_object

11 years agomesa: add additional missing z formats for render to texture
Brian Paul [Mon, 8 Mar 2010 16:58:54 +0000 (09:58 -0700)]
mesa: add additional missing z formats for render to texture

Allow render to texture for X8_Z24 and Z24_X8 formats.
Replace big if/else with switch, etc.

11 years agoradeon/r200/r600: allow src and dst BOs to be placed in GTT during blit
Alex Deucher [Mon, 8 Mar 2010 15:13:49 +0000 (10:13 -0500)]
radeon/r200/r600: allow src and dst BOs to be placed in GTT during blit

11 years agoradeon/r200/r600: reset bos when validating buffers during blit
Alex Deucher [Mon, 8 Mar 2010 15:04:02 +0000 (10:04 -0500)]
radeon/r200/r600: reset bos when validating buffers during blit

11 years agor600: recalculate point size, if point min/max size changes
Alex Deucher [Mon, 8 Mar 2010 15:00:59 +0000 (10:00 -0500)]
r600: recalculate point size, if point min/max size changes

11 years agor600: no need to flush on context init
Alex Deucher [Mon, 8 Mar 2010 14:57:26 +0000 (09:57 -0500)]
r600: no need to flush on context init

11 years agor300: don't enable EXT_packed_depth_stencil
Maciej Cencora [Sat, 13 Feb 2010 23:02:05 +0000 (00:02 +0100)]
r300: don't enable EXT_packed_depth_stencil

R300 hw doesn't support sampling from Z24_S8 or S8_Z24 formats.

11 years agoradeon: no need to emit full state twice after flush
Maciej Cencora [Sat, 16 Jan 2010 14:11:37 +0000 (15:11 +0100)]
radeon: no need to emit full state twice after flush

11 years agor300: allow src and dst BOs to be placed in GTT during blit
Maciej Cencora [Thu, 4 Mar 2010 17:35:55 +0000 (18:35 +0100)]
r300: allow src and dst BOs to be placed in GTT during blit

Fixes some relocation failures

11 years agor300: reset bos when validating buffers during blit
Maciej Cencora [Sat, 6 Feb 2010 17:25:36 +0000 (18:25 +0100)]
r300: reset bos when validating buffers during blit

11 years agoradeon: fallback to software in glCopyTexImage if blit isn't available
Maciej Cencora [Sat, 6 Feb 2010 18:37:23 +0000 (19:37 +0100)]
radeon: fallback to software in glCopyTexImage if blit isn't available

11 years agor300: VAP flush is needed only when vertex program or constants are changed
Maciej Cencora [Sun, 7 Mar 2010 11:02:28 +0000 (12:02 +0100)]
r300: VAP flush is needed only when vertex program or constants are changed

11 years agor300: recalculate point size, if point min/max size changes
Maciej Cencora [Sat, 6 Mar 2010 12:39:13 +0000 (13:39 +0100)]
r300: recalculate point size, if point min/max size changes

Fixes two wine d3d9 unit tests

11 years agor300: no need to flush on context init
Maciej Cencora [Sat, 6 Mar 2010 12:18:11 +0000 (13:18 +0100)]
r300: no need to flush on context init

11 years agor300: remove unnecessary code
Maciej Cencora [Sat, 6 Mar 2010 12:09:47 +0000 (13:09 +0100)]
r300: remove unnecessary code

_tnl_UpdateFixedFunctionProgram is already called in r300_draw.c

11 years agomesa: add render-to-texture case for MESA_FORMAT_S8_Z24
Brian Paul [Mon, 8 Mar 2010 16:38:07 +0000 (09:38 -0700)]
mesa: add render-to-texture case for MESA_FORMAT_S8_Z24

11 years agomesa: s/GL_DEPTH_STENCIL/GL_DEPTH_COMPONENT/ for MESA_FORMAT_Z16 renderbuffer
Brian Paul [Mon, 8 Mar 2010 16:34:46 +0000 (09:34 -0700)]

MESA_FORMAT_Z16 has no stencil bits.

11 years agost/vega: Fix OpenVG demo segfaults.
Chia-I Wu [Wed, 3 Mar 2010 15:51:13 +0000 (23:51 +0800)]
st/vega: Fix OpenVG demo segfaults.

When the paint is color, paint_bind_samplers binds a dummy sampler
without a texture.  It causes demos requiring a sampler (those use a
mask or an image) to crash.

11 years agogallivm: Initialize variables for default cases.
Vinson Lee [Sun, 7 Mar 2010 04:30:28 +0000 (20:30 -0800)]
gallivm: Initialize variables for default cases.

Fixes use of uninitialized variables in non-debug builds.

11 years agoprogs/demos: Add arbocclude2 to Makefile and .gitignore.
Vinson Lee [Sat, 6 Mar 2010 07:18:01 +0000 (23:18 -0800)]
progs/demos: Add arbocclude2 to Makefile and .gitignore.

11 years agoglx: Move initialization of ext_list_first_time to where it's storage is allocated
Brian Paul [Sat, 6 Mar 2010 00:32:36 +0000 (17:32 -0700)]
glx: Move initialization of ext_list_first_time to where it's storage is allocated

Move the initialization of ext_list_first_time from all of the DRI loader's
CreateScreen routines, to where the storage for the screen config is

It needs to get set in the screen-config even if DRI is forced off
using LIBGL_ALWAYS_INDIRECT, so that psc->direct_support is initialized
correctly, otherwise __glXExtensionBitIsEnabled() always returns FALSE

Specifically, this causes a problem with an X server which advertises
GLX<=1.2, and the GLX_SGIX_fbconfig extension.
glXGetFBConfigFromVisualSGIX() uses __glXExtensionBitIsEnabled() to
check if the GLX_SGIX_fbconfig extension is available, but that function
won't return correct information because that data has never been
initialized, because ext_list_first_time was never set...

Signed-off-by: Jon TURNEY <>
Signed-off-by: Brian Paul <>
(cherry picked from commit 96ab4d2b84178209ee59017458d9964b32b7e183)

11 years agodocs: remove merge conflict garbage
Brian Paul [Sat, 6 Mar 2010 00:32:07 +0000 (17:32 -0700)]
docs: remove merge conflict garbage

11 years agometa: Use the DrawBuffer's stencil size
Ian Romanick [Thu, 4 Mar 2010 01:20:27 +0000 (17:20 -0800)]
meta: Use the DrawBuffer's stencil size

Previously the code was erroneously using the stencil size of the
context instead of the stencil size of the DrawBuffer.  With FBOs
these may be different.  As a result, clearing the stencil buffer of
an FBO bound to a context that doesn't have stencil would fail.

Signed-off-by: Ian Romanick <>
11 years agoswrast: Remove redundant test of the visual's accumulation buffer size
Ian Romanick [Thu, 4 Mar 2010 01:17:56 +0000 (17:17 -0800)]
swrast: Remove redundant test of the visual's accumulation buffer size

If the visual doesn't have an accumulation buffer, the renderbuffer
passed into _swrast_clear_accum_buffer will be NULL anyway.  There is
no reason the check the visual.  Moreover, the test erroneously checks
the context's visual instead of the visual of the current DrawBuffer.
With FBOs these may be different.

Signed-off-by: Ian Romanick <>
11 years agoswrast: Adjust colors based on ReadBuffer visual, not context visual
Ian Romanick [Thu, 4 Mar 2010 01:16:11 +0000 (17:16 -0800)]
swrast: Adjust colors based on ReadBuffer visual, not context visual

In the presence of FBOs, the visual of the context may not match the,
possibly fake, visual of the current ReadBuffer.  Note that the caller
of adjust_colors correctly uses the visual of the ReadBuffer.

Signed-off-by: Ian Romanick <>
11 years agoswrast: Remove stray comment that mentions ctx->Visual
Ian Romanick [Thu, 4 Mar 2010 01:14:55 +0000 (17:14 -0800)]
swrast: Remove stray comment that mentions ctx->Visual

Signed-off-by: Ian Romanick <>
11 years agogallivm: checkpoint: code gen for mipmap selection
Brian Paul [Fri, 5 Mar 2010 23:52:11 +0000 (16:52 -0700)]
gallivm: checkpoint: code gen for mipmap selection

11 years agollvmpipe: added code to set texture depth, max mipmap levels info
Brian Paul [Fri, 5 Mar 2010 23:51:35 +0000 (16:51 -0700)]
llvmpipe: added code to set texture depth, max mipmap levels info

11 years agogallivm: added methods for getting texture depth, num mipmap levels
Brian Paul [Fri, 5 Mar 2010 23:50:48 +0000 (16:50 -0700)]
gallivm: added methods for getting texture depth, num mipmap levels

11 years agogallivm: checkpoint: texture LOD computation code gen
Brian Paul [Fri, 5 Mar 2010 23:07:54 +0000 (16:07 -0700)]
gallivm: checkpoint: texture LOD computation code gen

11 years agogallivm: added field for sampler lod
Brian Paul [Fri, 5 Mar 2010 23:07:26 +0000 (16:07 -0700)]
gallivm: added field for sampler lod

11 years agoi965: Only use the effective subset of the WM sampler key.
Eric Anholt [Fri, 5 Mar 2010 22:13:24 +0000 (14:13 -0800)]
i965: Only use the effective subset of the WM sampler key.

The whole structure is 836 bytes, but if only the first one or two
samplers are used (as is common), the part that matters is only 56 or
108 bytes.  By using just that subset as the key (since the key size
is also part of the key), we improve firefox-talos-gfx performance by

11 years agointel: Remove support for the DRI1 TFP extension.
Eric Anholt [Fri, 5 Mar 2010 21:48:41 +0000 (13:48 -0800)]
intel: Remove support for the DRI1 TFP extension.

11 years agoi965: Remove the paths for making a const surface object for a NULL BO.
Eric Anholt [Fri, 5 Mar 2010 21:38:02 +0000 (13:38 -0800)]
i965: Remove the paths for making a const surface object for a NULL BO.

11 years agoi965: Remove the unused SDC BO pointer from the sampler state key.
Eric Anholt [Fri, 5 Mar 2010 21:24:24 +0000 (13:24 -0800)]
i965: Remove the unused SDC BO pointer from the sampler state key.

Since it's a BO pointer, it already lives outside the key in
brw->wm.sdc_bo[] which is used for sampler state lookup and setup.

11 years agoi965: Rename SNB brw_*_key structs to gen6_*_key structs.
Eric Anholt [Fri, 5 Mar 2010 21:19:09 +0000 (13:19 -0800)]
i965: Rename SNB brw_*_key structs to gen6_*_key structs.

11 years agoi965: Pack gen6 blend_state_key structure.
Eric Anholt [Fri, 5 Mar 2010 21:18:13 +0000 (13:18 -0800)]
i965: Pack gen6 blend_state_key structure.

11 years agointel: Only do batchbuffer debug if --enable-debug is used.
Eric Anholt [Fri, 5 Mar 2010 20:56:40 +0000 (12:56 -0800)]
intel: Only do batchbuffer debug if --enable-debug is used.

This saves 6.6KB on the 965 driver, and appears to speed
firefox-talos-gfx up by 1-2%.  Unlike many other asserts in the
driver, when we make a mistake that would trigger one of these it
generally shows up all the time for developers, so turning it off for
release seems fine.

11 years agointel: Replace batch macro contents with function calls.
Eric Anholt [Fri, 5 Mar 2010 20:47:21 +0000 (12:47 -0800)]
intel: Replace batch macro contents with function calls.

This manages to cut down another 3800 bytes.

11 years agointel: Move the assertions about reloc delta from the macros to the function.
Eric Anholt [Fri, 5 Mar 2010 20:40:45 +0000 (12:40 -0800)]
intel: Move the assertions about reloc delta from the macros to the function.

Cuts another 1800 bytes from the driver.

11 years agointel: Check that the batch is mapped per BEGIN, not each OUT.
Eric Anholt [Fri, 5 Mar 2010 20:27:46 +0000 (12:27 -0800)]
intel: Check that the batch is mapped per BEGIN, not each OUT.

Shaves 800 bytes off the driver.

11 years agoi965: Try to assign SNB SF inputs to outputs.
Eric Anholt [Fri, 5 Mar 2010 20:27:25 +0000 (12:27 -0800)]
i965: Try to assign SNB SF inputs to outputs.

11 years agoi965: Fix the SNB SF input size.
Eric Anholt [Fri, 5 Mar 2010 02:26:33 +0000 (18:26 -0800)]
i965: Fix the SNB SF input size.

11 years agoAlways return VOLATILE for ObjectPurgeable(VOLATILE)
Chris Wilson [Fri, 5 Mar 2010 23:10:45 +0000 (23:10 +0000)]
Always return VOLATILE for ObjectPurgeable(VOLATILE)

Fixes fdo bug 26128.

The spec mandates that VOLATILE is returned from
ObjectPurgeable(VOLATILE) irrespective of the actual status of the
object upon completion of marking it purgeable.

Conform to the spec, even though it seems wrong.

Signed-off-by: Chris Wilson <>
11 years agollvmpipe: add pipe_thread_wait() calls
Brian Paul [Fri, 5 Mar 2010 21:24:02 +0000 (14:24 -0700)]
llvmpipe: add pipe_thread_wait() calls

Wait for threads to exit before cleaning up per-thread data.
Fixes hang on context destruction with glean makeCurrent test.
See fd.o bug 26536.

11 years agogallium/docs: document additional wrap mode restrictions
Brian Paul [Fri, 5 Mar 2010 20:30:24 +0000 (13:30 -0700)]
gallium/docs: document additional wrap mode restrictions

11 years agogallivm: minor arithmetic improvements
Brian Paul [Fri, 5 Mar 2010 20:27:51 +0000 (13:27 -0700)]
gallivm: minor arithmetic improvements

11 years agogallivm: implement non-normalized texture wrap modes
Brian Paul [Fri, 5 Mar 2010 20:21:56 +0000 (13:21 -0700)]
gallivm: implement non-normalized texture wrap modes

modes work with non-normalized texcoords.

11 years agosoftpipe: implement PIPE_TEX_WRAP_CLAMP_TO_EDGE for unorm texture sampling
Brian Paul [Fri, 5 Mar 2010 19:38:05 +0000 (12:38 -0700)]
softpipe: implement PIPE_TEX_WRAP_CLAMP_TO_EDGE for unorm texture sampling

CLAMP_TO_BORDER and CLAMP_TO_EDGE were doing the same thing.

11 years agomesa: minor reformatting, new comments
Brian Paul [Fri, 5 Mar 2010 19:32:32 +0000 (12:32 -0700)]
mesa: minor reformatting, new comments

11 years agoprogs/xdemos: fix up GLX extension checking
Jesse Barnes [Fri, 5 Mar 2010 19:21:12 +0000 (11:21 -0800)]
progs/xdemos: fix up GLX extension checking

A few of my programs were using the client string in addition to the
main extensions string to see if a feature was present.  Correct this to
only check for the currently available and working extensions.

11 years agoDRI2: expose OML_sync_control if possible
Jesse Barnes [Fri, 5 Mar 2010 19:17:19 +0000 (11:17 -0800)]
DRI2: expose OML_sync_control if possible

If the server supports the OML related protocol, enable support for the

11 years agoGLX: remove debug prints from glXWaitForMscOML dispatch
Jesse Barnes [Fri, 5 Mar 2010 18:31:39 +0000 (10:31 -0800)]
GLX: remove debug prints from glXWaitForMscOML dispatch

Leftover from earlier commit.

11 years agoxdemos/omlsync: add waitformsc and swap interval code
Jesse Barnes [Fri, 5 Mar 2010 18:28:41 +0000 (10:28 -0800)]
xdemos/omlsync: add waitformsc and swap interval code

11 years agoprogs: Add arbocclude2 demo.
Michal Krol [Fri, 5 Mar 2010 17:42:42 +0000 (18:42 +0100)]
progs: Add arbocclude2 demo.

11 years agogallium/docs: updated/improve sampler state documentation
Brian Paul [Fri, 5 Mar 2010 16:53:37 +0000 (09:53 -0700)]
gallium/docs: updated/improve sampler state documentation

11 years agodocs: document GL_APPLE_object_purgeable
Brian Paul [Fri, 5 Mar 2010 16:24:15 +0000 (09:24 -0700)]
docs: document GL_APPLE_object_purgeable

11 years agomesa: whitespace fixes, 80-column wrapping, etc.
Brian Paul [Fri, 5 Mar 2010 16:23:43 +0000 (09:23 -0700)]
mesa: whitespace fixes, 80-column wrapping, etc.

11 years agoMerge branch 'object-purgeable'
Chris Wilson [Fri, 5 Mar 2010 15:03:51 +0000 (15:03 +0000)]
Merge branch 'object-purgeable'

Acked-by: Brian Paul <>
11 years agoAPPLE_object_purgeable: intel
Chris Wilson [Wed, 13 Jan 2010 18:35:25 +0000 (18:35 +0000)]
APPLE_object_purgeable: intel

Implement support for purgeable objects by using the GEM madvise ioctl.

Signed-off-by: Chris Wilson <>
11 years agoAPPLE_object_purgeable: core
Chris Wilson [Fri, 13 Nov 2009 12:19:35 +0000 (12:19 +0000)]
APPLE_object_purgeable: core

Signed-off-by: Chris Wilson <>
11 years agomesa/es: Update GLAPI and APISpec for GL_OES_EGL_image.
Chia-I Wu [Thu, 25 Feb 2010 08:37:04 +0000 (16:37 +0800)]
mesa/es: Update GLAPI and APISpec for GL_OES_EGL_image.

This generates the entrypoints and dispatches for GL_OES_EGL_image.
There is no real support yet.

11 years agost/egl: Add support for EGL_KHR_image_base and EGL_KHR_image_pixmap.
Chia-I Wu [Fri, 5 Mar 2010 03:18:16 +0000 (11:18 +0800)]
st/egl: Add support for EGL_KHR_image_base and EGL_KHR_image_pixmap.

These extensions are not quite useful until the client APIs gain support
for the respective EGLImage extensions.