Re: [Mesa-dev] [PATCH 5/6] vl: Remove most members of pipe_video_decoder

2011-12-18 Thread Maarten Lankhorst
Hey Andy, 2011/12/19 Andy Furniss : > Maarten Lankhorst wrote: >> >> Hey Andy, >> >> On 12/07/2011 05:48 PM, Andy Furniss wrote: >>> >>> Maarten Lankhorst wrote: >>> Hm, could you test with some added sanity checks? >>> >>> >>> mplayer: vl/vl_vlc.h:139: vl_vlc_eatbits: Assertion `vlc->valid_b

Re: [Mesa-dev] [PATCH 1/2] softpipe: fix texture sampling from 1D texture array

2011-12-18 Thread Brian Paul
On Sun, Dec 18, 2011 at 2:27 PM, Dave Airlie wrote: > From: Dave Airlie > > This is the first part of a fix to piglit glsl-fs-shadow1DArray > > Signed-off-by: Dave Airlie > --- >  src/gallium/auxiliary/tgsi/tgsi_exec.c |   13 + >  1 files changed, 13 insertions(+), 0 deletions(-) > >

Re: [Mesa-dev] [PATCH 2/2] softpipe: fix depth sampling for linear vs nearest.

2011-12-18 Thread Brian Paul
On Sun, Dec 18, 2011 at 2:39 PM, Dave Airlie wrote: > On Sun, Dec 18, 2011 at 9:27 PM, Dave Airlie wrote: >> From: Dave Airlie >> >> This sample compare was always doing linear, and this makes the >> glsl-fs-shadow1DArray test render like the Intel driver. >> >> Signed-off-by: Dave Airlie >> --

[Mesa-dev] [PATCH 22/22] swrast: rewrite glDrawPixels(GL_DEPTH) with zoom

2011-12-18 Thread Brian Paul
This gets rid of another renderbuffer->PutRow() call and _DepthBuffer usage. We always work with 32-bit uint Z values now. --- src/mesa/swrast/s_drawpix.c | 58 ++ src/mesa/swrast/s_zoom.c| 37 +- src/mesa/swrast/s_zoom.h

[Mesa-dev] [PATCH 21/22] swrast: stop using _DepthBuffer in triangle code

2011-12-18 Thread Brian Paul
The only consequence is we can only use the occlusion_zless_16_triangle() function with MESA_FORMAT_Z16. --- src/mesa/swrast/s_triangle.c | 27 +++ 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c

[Mesa-dev] [PATCH 20/22] mesa: remove gl_renderbuffer::PutRowRGB()

2011-12-18 Thread Brian Paul
No longer used anywhere. --- src/mesa/drivers/dri/common/depthtmp.h|1 - src/mesa/drivers/dri/common/spantmp2.h| 41 -- src/mesa/drivers/dri/common/stenciltmp.h |1 - src/mesa/drivers/dri/swrast/swrast_span.c |8 - src/mesa/drivers/dri/swrast/swrast_spantemp.

[Mesa-dev] [PATCH 19/22] swrast: stop using PutRowRGB() in triangle code

2011-12-18 Thread Brian Paul
--- src/mesa/swrast/s_triangle.c | 22 -- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 10d077f..c4d504b 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -142,7

[Mesa-dev] [PATCH 18/22] swrast: refactor fast_draw_rgba_pixels()

2011-12-18 Thread Brian Paul
Use Map/UnmapRenderbuffer() for the special, optimized cases we care about. --- src/mesa/swrast/s_drawpix.c | 401 ++- 1 files changed, 167 insertions(+), 234 deletions(-) diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index b4d91c0

[Mesa-dev] [PATCH 17/22] swrast: move swrast_render_start/finish() call in drawpixels code

2011-12-18 Thread Brian Paul
We don't want to call these functions if where we'll be using Map/UnmapRenderbuffer(). So push them further down in the drawpixels cases so that we can switch over to Map/UnmapRenderbuffer() step by step. --- src/mesa/swrast/s_drawpix.c | 34 -- 1 files changed,

[Mesa-dev] [PATCH 16/22] swrast: fast_draw_depth_stencil() for glDrawPixels(GL_DEPTH_STENCIL)

2011-12-18 Thread Brian Paul
Stop using deprecated renderbuffer PutRow() function. Note that we aren't using Map/UnmapRenderbuffer() yet because this call is inside a swrast_render_start/finish() pair. --- src/mesa/swrast/s_drawpix.c | 64 --- 1 files changed, 48 insertions(+), 16 de

[Mesa-dev] [PATCH 15/22] swrast: remove the copy_depth_stencil_pixels() function

2011-12-18 Thread Brian Paul
Hopefully glCopyPixels(GL_DEPTH_STENCIL) will be handled by the fast copy function. Otherwise, just do the copy with separate depth + stencil copies. That's effectively what the removed code did anyway. --- src/mesa/swrast/s_copypix.c | 181 +-- 1 files c

[Mesa-dev] [PATCH 14/22] swrast: stop using depth/stencil wrappers in CopyPixels code

2011-12-18 Thread Brian Paul
The functions that read depth/stencil values understand all (packed) depth/stencil buffer formats now so there's no reason to use the wrappers. Also, improve the format checks in fast_copy_pixels() to catch mismatched depth/stencil cases. --- src/mesa/swrast/s_copypix.c | 29 +++

[Mesa-dev] [PATCH 13/22] swrast: remove needless assignment in draw_depth_stencil_pixels()

2011-12-18 Thread Brian Paul
--- src/mesa/swrast/s_drawpix.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 7259881..4a661a0 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -617,7 +617,6 @@ draw_depth_stenci

[Mesa-dev] [PATCH 12/22] swast: replace renderbuffer->GetPointer() with _swrast_pixel_address()

2011-12-18 Thread Brian Paul
--- src/mesa/swrast/s_linetemp.h |2 +- src/mesa/swrast/s_triangle.c |4 ++-- src/mesa/swrast/s_tritemp.h |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h index f9f2d29..1668f7d 100644 --- a/src/mesa/swra

[Mesa-dev] [PATCH 11/22] swrast: use _swrast_pixel_address() helper function

2011-12-18 Thread Brian Paul
--- src/mesa/swrast/s_context.h | 12 src/mesa/swrast/s_depth.c | 18 -- src/mesa/swrast/s_stencil.c | 18 +++--- 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h index 446b99

[Mesa-dev] [PATCH 10/22] swrast: rewrite stencil test code

2011-12-18 Thread Brian Paul
Stop using the deprecated renderbuffer Get/Put Row/Values functions. Consolidate code paths, etc. The file is nearly half the size it used to be! --- src/mesa/swrast/s_stencil.c | 1119 ++- 1 files changed, 260 insertions(+), 859 deletions(-) diff --git a/

[Mesa-dev] [PATCH 09/22] swrast: remove dead code in s_stencil.c

2011-12-18 Thread Brian Paul
--- src/mesa/swrast/s_stencil.c | 33 - 1 files changed, 0 insertions(+), 33 deletions(-) diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c index 1d78e97..5abf817 100644 --- a/src/mesa/swrast/s_stencil.c +++ b/src/mesa/swrast/s_stencil.c @@ -

[Mesa-dev] [PATCH 08/22] swrast: rewrite _swrast_read_stencil_span()

2011-12-18 Thread Brian Paul
Use format pack/unpack functions instead of deprecated renderbuffer GetRow/PutRow functions. --- src/mesa/swrast/s_stencil.c | 31 ++- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c index 17b3b

[Mesa-dev] [PATCH 07/22] swrast: rewrite _swrast_read_depth_span_float()

2011-12-18 Thread Brian Paul
Stop using the deprecated renderbuffer GetRow() function. --- src/mesa/swrast/s_depth.c | 29 - 1 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c index f441795..806e62b 100644 --- a/src/mesa/swrast/s_

[Mesa-dev] [PATCH 06/22] mesa: rewrite _swrast_depth_bounds_test()

2011-12-18 Thread Brian Paul
Stop using the deprecated renderbuffer functions. --- src/mesa/swrast/s_depth.c | 103 +--- 1 files changed, 21 insertions(+), 82 deletions(-) diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c index 4d72d5a..f441795 100644 --- a/src/mesa/s

[Mesa-dev] [PATCH 05/22] swrast: rewrite depth-testing code

2011-12-18 Thread Brian Paul
Consolidate code, stop using the deprecateted renderbuffer Put/Get Row/Values() functions. --- src/mesa/swrast/s_depth.c | 1227 - 1 files changed, 208 insertions(+), 1019 deletions(-) diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c i

[Mesa-dev] [PATCH 04/22] swrast: stop using _swrast_get_values() in z/depth code

2011-12-18 Thread Brian Paul
--- src/mesa/swrast/s_depth.c | 81 +--- 1 files changed, 75 insertions(+), 6 deletions(-) diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c index 09c0be6..cedc7fd 100644 --- a/src/mesa/swrast/s_depth.c +++ b/src/mesa/swrast/s_depth.c @@

[Mesa-dev] [PATCH 03/22] swrast: stop using _swrast_get_values() in stencil code

2011-12-18 Thread Brian Paul
That function will go a way in the future. --- src/mesa/swrast/s_stencil.c | 31 ++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c index aa9ab16..17b3b12 100644 --- a/src/mesa/swrast/s_stencil

[Mesa-dev] [PATCH 02/22] swrast: do fast_copy_pixels() with Map/UnmapRenderbuffer()

2011-12-18 Thread Brian Paul
--- src/mesa/swrast/s_copypix.c | 131 +-- 1 files changed, 88 insertions(+), 43 deletions(-) diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index 3bdf48b..2a789ab 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_cop

[Mesa-dev] [PATCH 01/22] swrast: replace GetRow() call with _mesa_unpack_ubyte_stencil_row()

2011-12-18 Thread Brian Paul
--- src/mesa/swrast/s_stencil.c |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c index 5f81fe8..aa9ab16 100644 --- a/src/mesa/swrast/s_stencil.c +++ b/src/mesa/swrast/s_stencil.c @@ -26,6 +26,7 @@ #include "mai

[Mesa-dev] [PATCH 4/4] swrast: rewrite color buffer clearing to use Map/UnmapRenderbuffer()

2011-12-18 Thread Brian Paul
v2: use _mesa_pack_colormask() helper and fix incorrect masking arithmetic --- src/mesa/swrast/s_clear.c | 225 +++-- 1 files changed, 113 insertions(+), 112 deletions(-) diff --git a/src/mesa/swrast/s_clear.c b/src/mesa/swrast/s_clear.c index 3566370..d94

[Mesa-dev] [PATCH 3/4] mesa: add _mesa_pack_colormask()

2011-12-18 Thread Brian Paul
For generating bit-wise colormasks for arbitrary pixel formats. --- src/mesa/main/format_pack.c | 75 +++ src/mesa/main/format_pack.h |3 ++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/for

[Mesa-dev] [PATCH 2/4] mesa: add _mesa_get_format_max_bits()

2011-12-18 Thread Brian Paul
Returns max bits per channel for the given format. --- src/mesa/main/formats.c | 16 src/mesa/main/formats.h |3 +++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 1f83a53..cca0014 100644 --- a/src/mesa

[Mesa-dev] [PATCH 1/4] swrast: do depth/stencil clearing with Map/UnmapRenderbuffer()

2011-12-18 Thread Brian Paul
Another step toward getting rid of the renderbuffer PutRow/etc functions. v2: fix assorted depth/stencil clear bugs found by Eric --- src/mesa/swrast/s_clear.c | 49 ++--- src/mesa/swrast/s_depth.c | 235 --- src/mesa/swrast/s_depth.h |5 +-

[Mesa-dev] [PATCH 2/2] mesa: fix _mesa_store_texsubimage2d() for GL_TEXTURE_1D_ARRAY

2011-12-18 Thread Brian Paul
From: Brian Paul For 1D arrays, map each slice separately. Note that this was handled correctly in _mesa_store_teximage2d() but not here. --- src/mesa/main/texstore.c | 67 ++ 1 files changed, 44 insertions(+), 23 deletions(-) diff --git a/src/mesa

[Mesa-dev] [PATCH 1/2] mesa: update comment for MapTextureImage()

2011-12-18 Thread Brian Paul
From: Brian Paul --- src/mesa/main/dd.h |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 01cfff8..5816faa 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -491,6 +491,8 @@ struct dd_function_table { void (*Free

[Mesa-dev] [PATCH] mesa: split get_tex_rgba() into compressed/uncompressed versions

2011-12-18 Thread Brian Paul
From: Brian Paul This just splits one big function into two smaller ones for better readability. --- src/mesa/main/texgetimage.c | 322 +++--- 1 files changed, 176 insertions(+), 146 deletions(-) diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texge

Re: [Mesa-dev] [PATCH 5/6] vl: Remove most members of pipe_video_decoder

2011-12-18 Thread Andy Furniss
Maarten Lankhorst wrote: Hey Andy, On 12/07/2011 05:48 PM, Andy Furniss wrote: Maarten Lankhorst wrote: Hm, could you test with some added sanity checks? mplayer: vl/vl_vlc.h:139: vl_vlc_eatbits: Assertion `vlc->valid_bits> num_bits' failed. If that works, maybe remove the vl_vlc_fillbi

Re: [Mesa-dev] [PATCH 2/2] softpipe: fix depth sampling for linear vs nearest.

2011-12-18 Thread Dave Airlie
On Sun, Dec 18, 2011 at 9:27 PM, Dave Airlie wrote: > From: Dave Airlie > > This sample compare was always doing linear, and this makes the > glsl-fs-shadow1DArray test render like the Intel driver. > > Signed-off-by: Dave Airlie > --- >  src/gallium/drivers/softpipe/sp_tex_sample.c |   23 +

Re: [Mesa-dev] [PATCH 2/8] intel: Reuse intel_miptree_match_image().

2011-12-18 Thread Kenneth Graunke
On 12/15/2011 08:43 PM, Eric Anholt wrote: > This little bit of logic was duplicated, which isn't much, but I was > going to need to duplicate a bit of additional logic in the next > commit. > --- > src/mesa/drivers/dri/intel/intel_tex_validate.c | 15 ++- > 1 files changed, 6 insert

Re: [Mesa-dev] [PATCH 6/8] i965: Use the miptree format for texture surface format choice.

2011-12-18 Thread Kenneth Graunke
On 12/15/2011 08:43 PM, Eric Anholt wrote: > With separate stencil GL_DEPTH32F_STENCIL8, the miptree will have a > really different format (MESA_FORMAT_Z32_FLOAT) from the teximage > (MESA_FORMAT_Z32_FLOAT_X24S8). > > v2: Do it for gen7, too. > > Reviewed-by: Kenneth Graunke (v1) Oops. Yeah, t

[Mesa-dev] [PATCH 2/2] softpipe: fix depth sampling for linear vs nearest.

2011-12-18 Thread Dave Airlie
From: Dave Airlie This sample compare was always doing linear, and this makes the glsl-fs-shadow1DArray test render like the Intel driver. Signed-off-by: Dave Airlie --- src/gallium/drivers/softpipe/sp_tex_sample.c | 23 --- 1 files changed, 16 insertions(+), 7 deletions(

[Mesa-dev] [PATCH 1/2] softpipe: fix texture sampling from 1D texture array

2011-12-18 Thread Dave Airlie
From: Dave Airlie This is the first part of a fix to piglit glsl-fs-shadow1DArray Signed-off-by: Dave Airlie --- src/gallium/auxiliary/tgsi/tgsi_exec.c | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/au

[Mesa-dev] [Bug 42128] Crash when visiting a site with Firefox

2011-12-18 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=42128 --- Comment #6 from Thiago 2011-12-18 10:59:59 PST --- It also happens to me with mesa 7.11.2 same glxinfo as Thor's https://bugs.archlinux.org/task/27573 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You a

[Mesa-dev] [PATCH 7.11] gallium/dri: Handle xserver that doesn't send needless DRI2 invalidate events

2011-12-18 Thread Ville Syrjälä
Ever since xserver commit 531869448d07e00ae241120b59f35709d59c, the server no longer sends invalidate events to clients, unless they have performed a GetBuffers request since the drawable was last invalidated. If the drawable gets invalidated immediately after the GetBuffers request was proces

Re: [Mesa-dev] [PROPOSAL] gallium: move state enable bits from clip_state to rasterizer_state

2011-12-18 Thread Christoph Bumiller
On 17.12.2011 20:54, Marek Olšák wrote: > On Sat, Dec 17, 2011 at 4:45 PM, Christoph Bumiller > wrote: >> On 17.12.2011 15:45, Marek Olšák wrote: >>> --- >>> >>> This was suggested by Keith Whitwell in this email addressed to me on >>> 8/6/2010: >>> http://lists.freedesktop.org/archives/mesa-dev/

[Mesa-dev] [Bug 43896] Mesa assembly breaks Super Meat Boy, Shank

2011-12-18 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=43896 Marti changed: What|Removed |Added CC||ma...@juffo.org -- Configure bugmail: https://b

Re: [Mesa-dev] [PATCH 0/2 v3] Add support for clip distances in Gallium

2011-12-18 Thread Christoph Bumiller
On 17.12.2011 23:15, Bryan Cain wrote: > This is the third revision of my changes to add support for gl_ClipDistance > with Gallium. The difference between this set and v2 is that this set does > not add a new TGSI_PROPERTY indicating the number of clip distances used. > Instead, the UsageMask of

[Mesa-dev] [Bug 43629] mesa># gmake freebsd-dri-amd64 breaks

2011-12-18 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=43629 --- Comment #5 from zap...@berentweb.com 2011-12-18 01:17:11 PST --- EDIT: I have conflicting information here about NOUVEAU. Since my card is Radeon, I should not be using any nouveau (NVidia) modules as far as I understand. However, the build i