By the way, this series is availabe on my winsys-msaa-v22 branch.
-Chad
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
For test results, see the commit message in patch 16. The summary is that
piglit, oglconform, and xonotic are all happy. It was nice to play xonotic
without seeing ugly, jagged edges.
Many of these patches have already been reviewed. I'm not seeking additional
review for those, although additional
This function felt sloppy, so this patch cleans it up a little bit.
- Rename `color` to `i`. It is not a color value, only an iterator int.
- Move `depth_bits[0] = 0` into the non-accum loop because that is where
it used. The accum loop later overwrites depth_bits[0].
- Redefine `msaa_samples_ar
This turns on window system MSAA.
This patch changes the id of many GLX visuals and configs, but that
couldn't be prevented. I attempted to preserve the id's of extant configs
by appending the multisample configs to the end of the extant ones. But
somewhere, perhaps in the X server, the configs ar
If either argument to driConcatConfigs(a, b) is null or the empty list,
then simply return the other argument as the resultant list.
All callers were accomplishing that same behavior anyway. And each caller
accopmplished it with the same pattern. So this patch moves that external
pattern into the
DRI2 configs were constructed in intelInitScreen2. That function already
does too much, so move verbatim the code for creating configs to a new
function, intel_screen_make_configs.
CC: Eric Anholt
Reviewed-by: Paul Berry
Signed-off-by: Chad Versace
---
src/mesa/drivers/dri/intel/intel_screen.c
CC: Eric Anholt
Reviewed-by: Paul Berry
Signed-off-by: Chad Versace
---
src/mesa/drivers/dri/intel/intel_screen.c | 31 +++
1 file changed, 31 insertions(+)
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c
b/src/mesa/drivers/dri/intel/intel_screen.c
index 9ac
Add two new functions: intel_miptree_{map,unmap}_multisample, to which
intel_miptree_{map,unmap} dispatch. Only mapping flat, renderbuffer-like
miptrees are supported.
CC: Eric Anholt
CC: Paul Berry
Signed-off-by: Chad Versace
---
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 108 ++
Move the opencoded construction and destruction of intel_miptree_map into
new functions, intel_miptree_attach_map and intel_miptree_release_map.
This patch prevents code duplication in a future commit that adds support
for mapping multisample miptrees.
CC: Eric Anholt
CC: Paul Berry
Signed-off-b
Move the body of intel_miptree_map into a new function,
intel_miptree_map_singlesample. Now intel_miptree_map dispatches to the
new function. A future commit adds a multisample variant.
Ditto for intel_miptree_unmap.
CC: Paul Berry
CC: Eric Anholt
Signed-off-by: Chad Versace
---
src/mesa/driv
Do this at two locations:
- Immediately after drawing is complete.
- After blitting.
v2:
- Mark the front buffer too, per Paul.
- Mark after blitting, per Paul.
CC: Eric Anholt
CC: Paul Berry
Signed-off-by: Chad Versace
---
src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 2 +-
Immediately after obtaining, with DRI2GetBuffersWithFormat, the DRM buffer
handle for a DRI2 buffer, we wrap that DRM buffer handle with a region and
a miptree. This patch additionally allocates an accompanying multisample
miptree if the DRI2 buffer is multisampled.
Since we do not yet advertise m
Add function intel_renderbuffer_set_needs_downsample. It is a no-op
except on multisample winsys buffers shared with DRI2.
Reviewed-by: Paul Berry
Signed-off-by: Chad Versace
---
src/mesa/drivers/dri/intel/intel_fbo.c | 10 ++
src/mesa/drivers/dri/intel/intel_fbo.h | 3 +++
2 files cha
Move the logic for creating the ancillary hiz and mcs miptress for winsys
and non-texture renderbuffers from intel_alloc_renderbuffer_storage to
intel_miptree_create_for_renderbuffer. Let's try to isolate complex
miptree logic to intel_mipmap_tree.c.
Without this refactor, code duplication would b
These functions do an up or downsample between mt and mt->singlesample_mt.
Conceptually, these functions belong in intel_mipmap_tree.c. However, they
needs to interact with blorp, which is C++. So I created a new file,
brw_blorp_orphans.cpp, for these and other functions that fall into the
same ca
Add a new param, num_samples, to intel_create_renderbuffer and
intel_create_private_renderbuffer.
No multisample GL config is yet advertised, so the value of num_samples is
currently 0. For server-owned winsys buffers, gl_renderbuffer::NumSamples
is not yet used.
v2: Quantize num_samples just on
Add the following fields:
singlesamle_width0
singlesample_height0
singlesample_mt
needs_downsample
These will all be used by later commits that implement MSAA for window
system buffers.
CC: Paul Berry
Signed-off-by: Chad Versace
---
src/mesa/drivers/dri/intel/intel_mipmap_tree.
Rename quantize_num_samples to intel_quantize_num_samples and change the
first param from struct intel_context* to struct intel_screen*. The
function will later be used by intelCreateBuffer, which is not bound to
any context but is bound to a screen.
v2: Keep the function in intel_fbo.c, per Anhol
I just skimmed through it and couldn't find anything wrong.
Reviewed-by: Marek Olšák
Someday we should definitely do something like this in pipe_context too.
Marek
On Thu, Aug 2, 2012 at 9:16 PM, Brian Paul wrote:
> Merge the vertex/fragment versions of the cso_set/save/restore_samplers()
> f
This generally looks good. I have tested it on R700 and there are 2
regressions. I'll try to take a look at them tomorrow.
1) The test arb_seamless_cubemap is failing. I think the only way to
make that feature work correctly is to add a separate atom for it.
2) spec/glsl-1.30/execution/vs-texture
On Fri, Aug 03, 2012 at 01:53:06AM +0200, Lucas Stach wrote:
> Trivial series to convert Nouveau gallium drivers to automake
> in order to generate Makefiles.
>
> This is just the general direction in which the MESA buildsystem
> is moving. Aside from this it makes the "make" output a lot more
> r
---
configure.ac | 1 +
src/gallium/drivers/nvc0/Makefile| 12
src/gallium/drivers/nvc0/Makefile.am | 25 +
3 Dateien ge??ndert, 26 Zeilen hinzugef??gt(+), 12 Zeilen entfernt(-)
delete mode 100644 src/gallium/drivers/nvc0/Makefile
---
configure.ac | 1 +
src/gallium/drivers/nv30/Makefile| 12
src/gallium/drivers/nv30/Makefile.am | 16
3 Dateien ge??ndert, 17 Zeilen hinzugef??gt(+), 12 Zeilen entfernt(-)
delete mode 100644 src/gallium/drivers/nv30/Makefile
create m
---
configure.ac | 1 +
src/gallium/drivers/nv50/Makefile| 12
src/gallium/drivers/nv50/Makefile.am | 25 +
3 Dateien ge??ndert, 26 Zeilen hinzugef??gt(+), 12 Zeilen entfernt(-)
delete mode 100644 src/gallium/drivers/nv50/Makefile
Trivial series to convert Nouveau gallium drivers to automake
in order to generate Makefiles.
This is just the general direction in which the MESA buildsystem
is moving. Aside from this it makes the "make" output a lot more
readable and therefore helps to spot compiler warnings more easily.
Lucas
---
configure.ac| 1 +
src/gallium/drivers/nouveau/Makefile| 16
src/gallium/drivers/nouveau/Makefile.am | 16
3 Dateien ge??ndert, 17 Zeilen hinzugef??gt(+), 16 Zeilen entfernt(-)
delete mode 100644 src/gallium/drivers/nouveau/Ma
Render Target Write message should include source zero alpha value when
sample-alpha-to-coverage is enabled for an FBO with multiple render targets.
Source zero alpha value is used as fragment coverage for all the render
targets.
This patch makes piglit tests draw-buffers-alpha-to-coverage and
al
On Wed, Aug 1, 2012 at 4:52 PM, Vincent Lejeune wrote:
> ---
> src/gallium/drivers/r600/r600_asm.c | 18 ++
> 1 file changed, 18 insertions(+)
>
> diff --git a/src/gallium/drivers/r600/r600_asm.c
> b/src/gallium/drivers/r600/r600_asm.c
> index 0f28824..b0194bf 100644
> --- a/src/
Merge the vertex/fragment versions of the cso_set/save/restore_samplers()
functions. Now we pass the shader stage (PIPE_SHADER_x) to the function
to indicate vertex/fragment/geometry samplers. For example:
cso_single_sampler(cso, PIPE_SHADER_FRAGMENT, unit, sampler);
This results in quite a bit
On Thu, Aug 02, 2012 at 05:37:02PM +0200, Michel Dänzer wrote:
> From: Michel Dänzer
>
> Signed-off-by: Michel Dänzer
Reviewed-by: Tom Stellard
> ---
> src/gallium/drivers/radeon/SIInstructions.td |5 +
> 1 file changed, 5 insertions(+)
>
> diff --git a/src/gallium/drivers/radeon/SIIn
On Thu, Aug 02, 2012 at 05:37:03PM +0200, Michel Dänzer wrote:
> From: Michel Dänzer
>
> Signed-off-by: Michel Dänzer
Reviewed-by: Tom Stellard
> ---
> src/gallium/drivers/radeonsi/radeonsi_shader.c | 26
> ++--
> 1 file changed, 24 insertions(+), 2 deletions(-)
>
> dif
From: Michel Dänzer
Signed-off-by: Michel Dänzer
---
src/gallium/drivers/radeon/SIInstructions.td |5 +
1 file changed, 5 insertions(+)
diff --git a/src/gallium/drivers/radeon/SIInstructions.td
b/src/gallium/drivers/radeon/SIInstructions.td
index 94748b6..31b9e5e 100644
--- a/src/gall
From: Michel Dänzer
Signed-off-by: Michel Dänzer
---
src/gallium/drivers/radeonsi/radeonsi_shader.c | 26 ++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c
b/src/gallium/drivers/radeonsi/radeonsi_shader.c
in
On 08/02/2012 12:26 AM, Vinson Lee wrote:
Fixes uninitialized scalar variable defect reported by Coverity.
Signed-off-by: Vinson Lee
---
src/mesa/state_tracker/st_mesa_to_tgsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c
b/src
On 08/02/2012 07:14 AM, Marek Olšák wrote:
---
src/gallium/auxiliary/cso_cache/cso_context.c |4 ++--
src/gallium/auxiliary/cso_cache/cso_context.h |4 ++--
src/gallium/auxiliary/util/u_blit.c |8
src/gallium/auxiliary/util/u_gen_mipmap.c |4 ++--
src/
On 08/02/2012 07:14 AM, Marek Olšák wrote:
Cc: Stephane Marchesin
---
src/gallium/auxiliary/util/u_blitter.c | 86 ++
src/gallium/auxiliary/util/u_blitter.h |4 +
src/gallium/drivers/i915/i915_resource_texture.c |7 +-
src/gallium/drivers/i91
On Wed, Aug 01, 2012 at 05:21:36PM -0700, Ian Romanick wrote:
> From: Ian Romanick
>
> Signed-off-by: Ian Romanick
> Cc: Kristian Høgsberg
> Cc: Matt Turner
> ---
> src/egl/drivers/dri2/egl_dri2.c | 11 +--
> 1 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/src/egl
On Thu, Aug 02, 2012 at 11:33:43AM +0200, Christian König wrote:
> On 02.08.2012 11:21, Michel Dänzer wrote:
> >On Don, 2012-08-02 at 11:05 +0200, Christian König wrote:
> >>On 02.08.2012 07:51, Michel Dänzer wrote:
> >>>On Mit, 2012-08-01 at 23:28 +0200, Christian König wrote:
> Using the writ
---
.../drivers/r600/evergreen_compute_internal.c | 22 ++-
src/gallium/drivers/r600/evergreen_state.c | 143 ++--
src/gallium/drivers/r600/r600_pipe.h |6 +-
src/gallium/drivers/r600/r600_resource.h | 17 +++
src/gallium/drivers/r600/r
This is done on-demand, because we don't know in advance if a zbuffer
will be bound as depth or color.
---
src/gallium/drivers/r600/evergreen_state.c | 104 ++--
src/gallium/drivers/r600/r600_resource.h | 12
src/gallium/drivers/r600/r600_state.c | 53 +
---
src/gallium/drivers/r600/r600_texture.c | 28
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_texture.c
b/src/gallium/drivers/r600/r600_texture.c
index 81b5777..507dc16 100644
--- a/src/gallium/drivers/r600/r600_textu
Made obsolete by the libdrm surface allocator.
---
.../drivers/r600/evergreen_compute_internal.c |2 +-
src/gallium/drivers/r600/evergreen_state.c | 322
src/gallium/drivers/r600/r600_pipe.c |2 -
src/gallium/drivers/r600/r600_pipe.h
---
src/gallium/drivers/r600/r600_blit.c| 60 +--
src/gallium/drivers/r600/r600_texture.c | 46 +++-
2 files changed, 54 insertions(+), 52 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_blit.c
b/src/gallium/drivers/r600/r600_blit.c
Cc: Stephane Marchesin
---
src/gallium/auxiliary/util/u_blitter.c | 86 ++
src/gallium/auxiliary/util/u_blitter.h |4 +
src/gallium/drivers/i915/i915_resource_texture.c |7 +-
src/gallium/drivers/i915/i915_surface.c |7 ++
4 files cha
---
src/gallium/drivers/r600/evergreen_state.c |7 +--
src/gallium/drivers/r600/r600_blit.c | 12 +++-
src/gallium/drivers/r600/r600_pipe.h |1 +
src/gallium/drivers/r600/r600_state.c |6 --
4 files changed, 17 insertions(+), 9 deletions(-)
diff --gi
---
src/gallium/drivers/r600/r600_texture.c | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_texture.c
b/src/gallium/drivers/r600/r600_texture.c
index 4cf9cb8..5e99a04 100644
--- a/src/gallium/drivers/r600/r600_texture.c
---
src/gallium/auxiliary/util/u_blitter.c |6 ++
src/gallium/auxiliary/util/u_blitter.h | 10 +-
src/gallium/drivers/i915/i915_surface.c |2 +-
src/gallium/drivers/r600/r600_blit.c|2 +-
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/gallium/au
---
src/gallium/auxiliary/util/u_blitter.c | 26 ++
src/gallium/auxiliary/util/u_blitter.h |3 ++-
src/gallium/drivers/r300/r300_blit.c |2 +-
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_blitter.c
b/src/gallium/
I need this and it seems like it could be useful.
---
src/gallium/include/pipe/p_defines.h |1 +
1 file changed, 1 insertion(+)
diff --git a/src/gallium/include/pipe/p_defines.h
b/src/gallium/include/pipe/p_defines.h
index 8d787ec..59c6382 100644
--- a/src/gallium/include/pipe/p_defines.h
++
---
src/gallium/auxiliary/util/u_blitter.c | 12 ++--
src/gallium/auxiliary/util/u_blitter.h |4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_blitter.c
b/src/gallium/auxiliary/util/u_blitter.c
index 1ad6c14..6015ad6 100644
--- a/sr
---
src/gallium/auxiliary/tgsi/tgsi_strings.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c
b/src/gallium/auxiliary/tgsi/tgsi_strings.c
index b5fd1fc..5f8f4be 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
+++ b/sr
---
src/gallium/auxiliary/util/u_blitter.c | 10 ++
src/gallium/auxiliary/util/u_blitter.h | 10 ++
2 files changed, 20 insertions(+)
diff --git a/src/gallium/auxiliary/util/u_blitter.c
b/src/gallium/auxiliary/util/u_blitter.c
index b31ac2d..1ad6c14 100644
--- a/src/gallium/a
---
src/gallium/auxiliary/util/u_blit.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/src/gallium/auxiliary/util/u_blit.c
b/src/gallium/auxiliary/util/u_blit.c
index 1beca0f..3992f71 100644
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -507,
---
src/gallium/auxiliary/util/u_blit.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/auxiliary/util/u_blit.c
b/src/gallium/auxiliary/util/u_blit.c
index 84af2b4..1beca0f 100644
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_bli
The sample mask affects single-sampled rendering too (it's orthogonal
to the color mask).
---
src/gallium/auxiliary/cso_cache/cso_context.c | 13 -
src/gallium/auxiliary/cso_cache/cso_context.h |2 ++
src/gallium/auxiliary/util/u_blit.c |6 ++
src/gallium/auxili
---
src/gallium/auxiliary/cso_cache/cso_context.c |4 ++--
src/gallium/auxiliary/cso_cache/cso_context.h |4 ++--
src/gallium/auxiliary/util/u_blit.c |8
src/gallium/auxiliary/util/u_gen_mipmap.c |4 ++--
src/gallium/state_trackers/vega/renderer.c| 12 +
On Wed, Aug 01, 2012 at 11:28:24PM +0200, Christian König wrote:
> I don't know if this is a good idea, but it
> fixes the problem at hand.
>
> Signed-off-by: Christian König
Reviewed-by: Tom Stellard
> ---
> src/gallium/drivers/radeon/SICodeEmitter.cpp | 27
> +++---
>
On Wed, Aug 1, 2012 at 8:21 PM, Ian Romanick wrote:
> From: Ian Romanick
>
> KHR extension name is reserved for Khronos ratified extensions, and there is
> no such thing as EGL_KHR_surfaceless_{gles1,gles2,opengl}. Replace these
> three extensions with EGL_KHR_surfaceless_context since that exte
On Don, 2012-08-02 at 11:57 +0200, Christian König wrote:
> On 02.08.2012 11:46, Michel Dänzer wrote:
> > On Don, 2012-08-02 at 11:33 +0200, Christian König wrote:
> >> On 02.08.2012 11:21, Michel Dänzer wrote:
> >>> On Don, 2012-08-02 at 11:05 +0200, Christian König wrote:
> On 02.08.2012 07
On 02.08.2012 11:46, Michel Dänzer wrote:
On Don, 2012-08-02 at 11:33 +0200, Christian König wrote:
On 02.08.2012 11:21, Michel Dänzer wrote:
On Don, 2012-08-02 at 11:05 +0200, Christian König wrote:
On 02.08.2012 07:51, Michel Dänzer wrote:
Couldn't this incorrectly clobber components of the
On Don, 2012-08-02 at 11:33 +0200, Christian König wrote:
> On 02.08.2012 11:21, Michel Dänzer wrote:
> > On Don, 2012-08-02 at 11:05 +0200, Christian König wrote:
> >> On 02.08.2012 07:51, Michel Dänzer wrote:
> >
> >>> Couldn't this incorrectly clobber components of the destination which
> >>> w
On 02.08.2012 11:21, Michel Dänzer wrote:
On Don, 2012-08-02 at 11:05 +0200, Christian König wrote:
On 02.08.2012 07:51, Michel Dänzer wrote:
On Mit, 2012-08-01 at 23:28 +0200, Christian König wrote:
Using the writemask in the sampler results in packet
VGPRS.
What does that mean?
The instruc
On Don, 2012-08-02 at 11:05 +0200, Christian König wrote:
> On 02.08.2012 07:51, Michel Dänzer wrote:
> > On Mit, 2012-08-01 at 23:28 +0200, Christian König wrote:
> >> Using the writemask in the sampler results in packet
> >> VGPRS.
> > What does that mean?
>
> The instructions with a destinatio
On 02.08.2012 07:51, Michel Dänzer wrote:
On Mit, 2012-08-01 at 23:28 +0200, Christian König wrote:
Using the writemask in the sampler results in packet
VGPRS.
What does that mean?
The instructions with a destination mask are packing their results, e.g.
when you sample RGBA you get:
R in VG
Fixes uninitialized scalar variable defect reported by Coverity.
Signed-off-by: Vinson Lee
---
src/mesa/state_tracker/st_mesa_to_tgsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c
b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 9
On Mit, 2012-08-01 at 23:28 +0200, Christian König wrote:
> Signed-off-by: Christian König
> ---
> src/gallium/drivers/radeonsi/radeonsi_shader.c | 11 ++-
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c
> b/src/galliu
On Mit, 2012-08-01 at 23:28 +0200, Christian König wrote:
> Using the writemask in the sampler results in packet
> VGPRS.
What does that mean?
> For now just sample all components and let llvm chose the right one.
>
> Signed-off-by: Christian König
> ---
> src/gallium/drivers/radeonsi/radeon
67 matches
Mail list logo
