Brian Paul [Mon, 8 Mar 2010 20:25:28 +0000 (13:25 -0700)]
llvmpipe: rewrap for 80 columns
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.
Zack Rusin [Mon, 8 Mar 2010 20:04:04 +0000 (15:04 -0500)]
gallivm: fix a crash by making sure we set the has_mask flag correctly
Jesse Barnes [Mon, 8 Mar 2010 19:30:26 +0000 (11:30 -0800)]
xdemos/omlsync: improve OML WaitMsc test
Use the divisor/remainder for the WaitForMscOML call if a wait_interval
is passed. Allows for testing of the WaitMSC paths in the server & DDX.
Brian Paul [Mon, 8 Mar 2010 18:43:20 +0000 (11:43 -0700)]
Merge branch '7.8'
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.
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.
Alex Deucher [Mon, 8 Mar 2010 16:59:02 +0000 (11:59 -0500)]
r600: enable GL_ARB_pixel_buffer_object
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.
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
Alex Deucher [Mon, 8 Mar 2010 15:04:02 +0000 (10:04 -0500)]
radeon/r200/r600: reset bos when validating buffers during blit
Alex Deucher [Mon, 8 Mar 2010 15:00:59 +0000 (10:00 -0500)]
r600: recalculate point size, if point min/max size changes
Alex Deucher [Mon, 8 Mar 2010 14:57:26 +0000 (09:57 -0500)]
r600: no need to flush on context init
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.
Maciej Cencora [Sat, 16 Jan 2010 14:11:37 +0000 (15:11 +0100)]
radeon: no need to emit full state twice after flush
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
Maciej Cencora [Sat, 6 Feb 2010 17:25:36 +0000 (18:25 +0100)]
r300: reset bos when validating buffers during blit
Maciej Cencora [Sat, 6 Feb 2010 18:37:23 +0000 (19:37 +0100)]
radeon: fallback to software in glCopyTexImage if blit isn't available
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
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
Maciej Cencora [Sat, 6 Mar 2010 12:18:11 +0000 (13:18 +0100)]
r300: no need to flush on context init
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
Brian Paul [Mon, 8 Mar 2010 16:38:07 +0000 (09:38 -0700)]
mesa: add render-to-texture case for MESA_FORMAT_S8_Z24
Brian Paul [Mon, 8 Mar 2010 16:34:46 +0000 (09:34 -0700)]
mesa: s/GL_DEPTH_STENCIL/GL_DEPTH_COMPONENT/ for MESA_FORMAT_Z16 renderbuffer
MESA_FORMAT_Z16 has no stencil bits.
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
Alex Deucher [Mon, 8 Mar 2010 15:04:02 +0000 (10:04 -0500)]
radeon/r200/r600: reset bos when validating buffers during blit
Alex Deucher [Mon, 8 Mar 2010 15:00:59 +0000 (10:00 -0500)]
r600: recalculate point size, if point min/max size changes
Alex Deucher [Mon, 8 Mar 2010 14:57:26 +0000 (09:57 -0500)]
r600: no need to flush on context init
Keith Whitwell [Mon, 8 Mar 2010 12:03:46 +0000 (12:03 +0000)]
Merge commit 'origin/gallium-winsys-handle-rebased'
Marek Olšák [Mon, 8 Mar 2010 03:38:16 +0000 (04:38 +0100)]
r300g: fix updating the tiling flags for the framebuffer state
Marek Olšák [Mon, 8 Mar 2010 03:31:03 +0000 (04:31 +0100)]
r300g: remove unnecessary state emissions and clean up
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.
Francisco Jerez [Sun, 7 Mar 2010 18:12:27 +0000 (19:12 +0100)]
dri/nouveau: Split big client buffers in the indexed case too.
Francisco Jerez [Sun, 7 Mar 2010 17:40:21 +0000 (18:40 +0100)]
dri/nouveau: Fix nv[12]x color sum.
Andrew Randrianasulu [Sun, 7 Mar 2010 01:09:21 +0000 (01:09 +0000)]
dri/nv04: GL_EXT_secondary_color
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Andrew Randrianasulu [Tue, 2 Mar 2010 01:29:14 +0000 (01:29 +0000)]
dri/nouveau: Trivially add GL_NV_blend_square
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Francisco Jerez [Sun, 7 Mar 2010 13:20:31 +0000 (14:20 +0100)]
dri/nouveau: Check _ColorDrawBuffers[0] before emitting fb state.
Maciej Cencora [Sun, 7 Mar 2010 14:00:29 +0000 (15:00 +0100)]
radeon: handle compressed sRGB texture formats
Marek Olšák [Tue, 23 Feb 2010 00:14:44 +0000 (01:14 +0100)]
r300g: fix DRM errors
Marek Olšák [Fri, 19 Feb 2010 02:02:34 +0000 (03:02 +0100)]
r300g: disable macrotiling when the texture height is smaller than a macrotile
Otherwise incorrect rendering occurs (no idea why).
Marek Olšák [Sun, 14 Feb 2010 03:57:09 +0000 (04:57 +0100)]
r300g: enable micro- and macrotiling for all textures and renderbuffers
Marek Olšák [Sun, 14 Feb 2010 02:19:01 +0000 (03:19 +0100)]
r300g: add ability to tile/detile textures using blit during transfers
Marek Olšák [Sat, 6 Feb 2010 02:11:50 +0000 (03:11 +0100)]
r300g: move r300_transfer to separate files
Maciej Cencora [Sun, 17 Jan 2010 11:47:46 +0000 (12:47 +0100)]
radeon: move glGetTexImage handlers to seperate file
Maciej Cencora [Sun, 7 Mar 2010 11:15:25 +0000 (12:15 +0100)]
radeon: Some possible improvements that I spoted in radeon_tiled_texture branch.
Maciej Cencora [Sun, 7 Mar 2010 11:09:43 +0000 (12:09 +0100)]
radeon: properly calculate rowstride for tiled images
Maciej Cencora [Sat, 16 Jan 2010 22:11:36 +0000 (23:11 +0100)]
radeon: minor refactoring of mipmap code
Maciej Cencora [Sat, 9 Jan 2010 19:36:47 +0000 (20:36 +0100)]
radeon: add texture helper function
Maciej Cencora [Sat, 6 Feb 2010 17:38:01 +0000 (18:38 +0100)]
radeon: add some debugging info to sw tiling/untiling functions
Maciej Cencora [Sat, 6 Feb 2010 12:46:17 +0000 (13:46 +0100)]
radeon: add software untiling functions
Maciej Cencora [Sat, 16 Jan 2010 22:11:10 +0000 (23:11 +0100)]
radeon: add tile size getter
Maciej Cencora [Sat, 16 Jan 2010 17:38:17 +0000 (18:38 +0100)]
radeon: added tiling functions
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.
Maciej Cencora [Sat, 16 Jan 2010 14:11:37 +0000 (15:11 +0100)]
radeon: no need to emit full state twice after flush
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
Maciej Cencora [Sat, 6 Feb 2010 17:25:36 +0000 (18:25 +0100)]
r300: reset bos when validating buffers during blit
Maciej Cencora [Sat, 6 Feb 2010 18:37:23 +0000 (19:37 +0100)]
radeon: fallback to software in glCopyTexImage if blit isn't available
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
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
Maciej Cencora [Sat, 6 Mar 2010 12:18:11 +0000 (13:18 +0100)]
r300: no need to flush on context init
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
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.
Marek Olšák [Sun, 7 Mar 2010 02:17:58 +0000 (03:17 +0100)]
r300g: disable emitting the HWTCL-related state when SWTCL is in use
Now SWTCL renders at least "something", we're close...
Marek Olšák [Sun, 7 Mar 2010 02:00:07 +0000 (03:00 +0100)]
r300g: resurrect r300_emit_vertex_buffer for SWTCL
Taken over from
c9928ac3ee5dc0d10127388f9312779a6c59da7c.
Marek Olšák [Sun, 7 Mar 2010 01:40:57 +0000 (02:40 +0100)]
r300g: validate buffers when using SWTCL
Marek Olšák [Sun, 7 Mar 2010 01:32:09 +0000 (02:32 +0100)]
r300g: share the VS-output-mapping state with SWTCL
And associated cleanups.
Marek Olšák [Sun, 7 Mar 2010 00:12:57 +0000 (01:12 +0100)]
r300g: abort if FS compilation fails on non-debug builds
Marek Olšák [Sat, 6 Mar 2010 22:29:17 +0000 (23:29 +0100)]
r300g: minor cleanups after the no-rhw merge
Marek Olšák [Sat, 6 Mar 2010 18:35:10 +0000 (19:35 +0100)]
r300g: clamp vertex max index according to currently bound buffers
José Fonseca [Sat, 6 Mar 2010 14:22:56 +0000 (14:22 +0000)]
util: Use bitshift arithmetic to unpack pixels.
All test cases pass now.
José Fonseca [Sat, 6 Mar 2010 13:42:37 +0000 (13:42 +0000)]
progs/gallium/unit: Remove the test cases.
José Fonseca [Sat, 6 Mar 2010 13:42:11 +0000 (13:42 +0000)]
util: Move the format tests cases here so that they can be easily shared.
George Sapountzis [Sat, 6 Mar 2010 05:05:06 +0000 (07:05 +0200)]
include/GL: drop more deprecated headers
José Fonseca [Sat, 6 Mar 2010 12:50:47 +0000 (12:50 +0000)]
util: Several fixes to clamping and test.
All tests pass here except util_format_b5g5r5a1_unorm_unpack_4ub, due to
apparently a gcc 4.4.3 bug.
José Fonseca [Sat, 6 Mar 2010 12:49:14 +0000 (12:49 +0000)]
util: Fix the maximum value computation for SSCALED channels.
José Fonseca [Sat, 6 Mar 2010 12:48:39 +0000 (12:48 +0000)]
util: Add a new flag, for formats that can be described as a bitmask.
José Fonseca [Sat, 6 Mar 2010 12:47:49 +0000 (12:47 +0000)]
progs/gallium/unit: Skip test cases which cannot be represented in 4ub.
José Fonseca [Sat, 6 Mar 2010 12:47:01 +0000 (12:47 +0000)]
progs/gallium/unit: Use the shortened name to reconstruct the function being tested.
José Fonseca [Sat, 6 Mar 2010 12:46:29 +0000 (12:46 +0000)]
util: Add the shortened format name to the description.
José Fonseca [Sat, 6 Mar 2010 12:45:36 +0000 (12:45 +0000)]
progs/gallium/unit: Cleanup/fix PIPE_FORMAT_R8SG8SB8UX8U_NORM test cases.
José Fonseca [Sat, 6 Mar 2010 10:23:07 +0000 (10:23 +0000)]
gallivm: Add some notes about sampler static state construction.
Recover some logic to make state canonical, although it is admittedly very
shy compared with what could be done.
We really need an helper module to make state canonical.
José Fonseca [Sat, 6 Mar 2010 09:45:05 +0000 (09:45 +0000)]
gallivm: Answer question/comment.
This reverts commit
71c05689528d7987bfb99c3afe04e456887bc7b7.
José Fonseca [Sat, 6 Mar 2010 09:34:04 +0000 (09:34 +0000)]
scons: Refuse to use LLVM 2.7 for now.
LLVM's trunk is totally broken, at least for x86_64.
See http://www.llvm.org/bugs/show_bug.cgi?id=6429
José Fonseca [Sat, 6 Mar 2010 09:18:15 +0000 (09:18 +0000)]
scons: Fix version comparisons.
José Fonseca [Fri, 5 Mar 2010 15:22:43 +0000 (15:22 +0000)]
gallivm: Add a placeholder for TGSI_FILE_PREDICATE registers.
José Fonseca [Fri, 5 Mar 2010 15:22:12 +0000 (15:22 +0000)]
gallivm: Integrate udis86 on scons builds.
José Fonseca [Fri, 5 Mar 2010 15:09:08 +0000 (15:09 +0000)]
gallivm: Generate valid IR for LLVM 2.7.
The signatures for pack intrinsics were made more consistent in this
version.
José Fonseca [Fri, 5 Mar 2010 15:07:50 +0000 (15:07 +0000)]
scons: Detect and support LLVM 2.7.
Vinson Lee [Sat, 6 Mar 2010 07:18:01 +0000 (23:18 -0800)]
progs/demos: Add arbocclude2 to Makefile and .gitignore.
George Sapountzis [Sat, 6 Mar 2010 04:33:21 +0000 (06:33 +0200)]
dri: drop MINIGLX_SOURCES (2)
George Sapountzis [Sat, 6 Mar 2010 04:33:20 +0000 (06:33 +0200)]
dri: drop MINIGLX_SOURCES
George Sapountzis [Sat, 6 Mar 2010 04:33:20 +0000 (06:33 +0200)]
config: drop WINDOW_SYSTEM var
Brian Paul [Sat, 6 Mar 2010 00:36:34 +0000 (17:36 -0700)]
docs: skeleton for 7.9 release notes
Brian Paul [Sat, 6 Mar 2010 00:35:01 +0000 (17:35 -0700)]
mesa: bump version to 7.9
Now that the 7.8 branch has been created Mesa/master will be version 7.9
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
allocated.
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 <jon.turney@dronecode.org.uk>
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit
96ab4d2b84178209ee59017458d9964b32b7e183)
Brian Paul [Sat, 6 Mar 2010 00:32:07 +0000 (17:32 -0700)]
docs: remove merge conflict garbage
Jon TURNEY [Wed, 1 Jul 2009 20:18:13 +0000 (21:18 +0100)]
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
allocated.
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 <jon.turney@dronecode.org.uk>
Signed-off-by: Brian Paul <brianp@vmware.com>
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 <ian.d.romanick@intel.com>
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 <ian.d.romanick@intel.com>
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 <ian.d.romanick@intel.com>