Re: [Mesa-dev] [PATCH 2/2] mesa/glsl: rename preprocess to glcpp_preprocess

2012-09-14 Thread Kenneth Graunke
On 09/13/2012 11:44 PM, Dave Airlie wrote: > On Fri, Sep 14, 2012 at 4:36 PM, Kenneth Graunke > wrote: >> On 09/13/2012 05:13 PM, Dave Airlie wrote: >>> From: Dave Airlie >>> >>> This symbol with dricore escapes into the namespace, its too generic, >>> we should prefix it with something just to

Re: [Mesa-dev] [PATCH 16/19] mesa: Don't set uniform dispatch pointers for many things in ES2 or core

2012-09-14 Thread Ian Romanick
On 09/08/2012 12:08 AM, Eric Anholt wrote: Ian Romanick writes: From: Ian Romanick NOTE: This is a candidate for the 9.0 branch Signed-off-by: Ian Romanick I've reviewed up to this point, with reference to the gles3 spec to see if anything got missed there. I noted that a bunch of thing

Re: [Mesa-dev] Proposal for an Updated Linux OpenGL ABI

2012-09-14 Thread Ian Romanick
On 09/13/2012 12:09 AM, Andy Ritger wrote: There was some recent Khronos discussion about updating the OpenGL Implementer's Guide for Linux, to which Ian Romanick noted that this topic will be discussed at XDC as part of the broad "Discuss the future of EGL, GLX, and OpenGL ES on Linux" agenda it

[Mesa-dev] [PATCH 2/2] build: Enable maintainer mode

2012-09-14 Thread Thierry Reding
When running the configure script from autogen.sh, enable the maintainer mode by passing --enable-maintainer-mode. This activates some rules to regenerate autotools files automatically. --- autogen.sh | 2 +- configure.ac | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/autog

[Mesa-dev] [PATCH 1/2] build: Don't cross-compile GLSL builtin compiler

2012-09-14 Thread Thierry Reding
The builtin_compiler binary is used during the build process to generate code for the builtin GLSL functions. Since this binary needs to be run on the build host, it must not be cross-compiled. This patch fixes the build system to compile a second version of the source files and the builtin_compil

[Mesa-dev] [Bug 44618] Cross-compilation broken by glsl builtin_compiler

2012-09-14 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=44618 Thierry Reding changed: What|Removed |Added Attachment #55540|0 |1 is obsolete|

Re: [Mesa-dev] [PATCH 2/2] build: Enable maintainer mode

2012-09-14 Thread Michel Dänzer
On Fre, 2012-09-14 at 09:22 +0200, Thierry Reding wrote: > When running the configure script from autogen.sh, enable the maintainer > mode by passing --enable-maintainer-mode. This activates some rules to > regenerate autotools files automatically. > --- > autogen.sh | 2 +- > configure.ac | 1

Re: [Mesa-dev] [PATCH 2/2] build: Enable maintainer mode

2012-09-14 Thread Thierry Reding
On Fri, Sep 14, 2012 at 09:45:54AM +0200, Michel Dänzer wrote: > On Fre, 2012-09-14 at 09:22 +0200, Thierry Reding wrote: > > When running the configure script from autogen.sh, enable the maintainer > > mode by passing --enable-maintainer-mode. This activates some rules to > > regenerate autotools

Re: [Mesa-dev] [PATCH 2/2] build: Enable maintainer mode

2012-09-14 Thread Michel Dänzer
On Fre, 2012-09-14 at 09:58 +0200, Thierry Reding wrote: > On Fri, Sep 14, 2012 at 09:45:54AM +0200, Michel Dänzer wrote: > > On Fre, 2012-09-14 at 09:22 +0200, Thierry Reding wrote: > > > When running the configure script from autogen.sh, enable the maintainer > > > mode by passing --enable-main

Re: [Mesa-dev] [git pull] 9.0 fixes

2012-09-14 Thread Ian Romanick
On 09/12/2012 11:45 PM, Andreas Boll wrote: Hi list, I've cherry-picked some commits for the 9.0 branch. I've done a piglit (1d05317) quick-driver run with r600g on my rv770 without any regressions. Could someone pull from my branch and push the patches to the 9.0 branch? I did a quick piglit

Re: [Mesa-dev] [PATCH 2/2] build: Enable maintainer mode

2012-09-14 Thread Thierry Reding
On Fri, Sep 14, 2012 at 10:05:44AM +0200, Michel Dänzer wrote: > On Fre, 2012-09-14 at 09:58 +0200, Thierry Reding wrote: > > On Fri, Sep 14, 2012 at 09:45:54AM +0200, Michel Dänzer wrote: > > > On Fre, 2012-09-14 at 09:22 +0200, Thierry Reding wrote: > > > > When running the configure script fro

Re: [Mesa-dev] [PATCH 2/3] i965: Do texture swizzling in hardware on Haswell.

2012-09-14 Thread Kenneth Graunke
On 09/13/2012 01:50 PM, Paul Berry wrote: > On 10 September 2012 14:15, Kenneth Graunke > wrote: > > Haswell supports EXT_texture_swizzle and legacy DEPTH_TEXTURE_MODE > swizzling by setting SURFACE_STATE entries. This means we don't have to > bake the s

[Mesa-dev] [PATCH] glcpp: fix abuse of yylex

2012-09-14 Thread Dave Airlie
So glcpp tried to workaround yylex its own way, but failed, do it properly. This fixes another crash found after fixing the first crash. this is a candidate for 9.0 and stable branches Signed-off-by: Dave Airlie --- src/glsl/glcpp/Makefile.am | 2 +- src/glsl/glcpp/glcpp-parse.y | 8

[Mesa-dev] [PATCH] meta: Don't _mesa_set_enable() invalid targets in ES 1.

2012-09-14 Thread Kenneth Graunke
GL_TEXTURE_1D, GL_TEXTURE_RECTANGLE, and GL_TEXTURE_GEN_* don't exist in ES 1 contexts, so any meta ops that used _mesa_meta_begin with MESA_META_TEXTURE would trigger GL errors. One such operation is _mesa_meta_Clear(). Fixes the ES1 conformance test miplin.c, which was regressed by commit 08be1

Re: [Mesa-dev] [PATCH 2/2] build: Enable maintainer mode

2012-09-14 Thread Michel Dänzer
On Fre, 2012-09-14 at 11:49 +0200, Thierry Reding wrote: > On Fri, Sep 14, 2012 at 10:05:44AM +0200, Michel Dänzer wrote: > > On Fre, 2012-09-14 at 09:58 +0200, Thierry Reding wrote: > > > On Fri, Sep 14, 2012 at 09:45:54AM +0200, Michel Dänzer wrote: > > > > On Fre, 2012-09-14 at 09:22 +0200, Th

Re: [Mesa-dev] [PATCH v2 00/45] Remove many of the FEATURE_* defines.

2012-09-14 Thread Oliver McFadden
On Thu, Sep 13, 2012 at 03:00:48PM -0600, Brian Paul wrote: > On 09/13/2012 02:18 AM, Oliver McFadden wrote: > > Hi, > > > > As requested here is the second version of the patch series which removes > > almost > > all of the FEATURE_* defines, typically used to enable or disable some GL > > featur

Re: [Mesa-dev] [PATCH 2/2] build: Enable maintainer mode

2012-09-14 Thread Thierry Reding
On Fri, Sep 14, 2012 at 12:12:33PM +0200, Michel Dänzer wrote: > On Fre, 2012-09-14 at 11:49 +0200, Thierry Reding wrote: [...] > > Not as far as I know. Unless you add AM_MAINTAINER_MODE and run > > configure with --enable-maintainer-mode you won't get automatic > > regeneration. > > > > In fact

Re: [Mesa-dev] [PATCH] glcpp: fix abuse of yylex

2012-09-14 Thread Kenneth Graunke
On 09/14/2012 03:01 AM, Dave Airlie wrote: > So glcpp tried to workaround yylex its own way, but failed, > do it properly. > > This fixes another crash found after fixing the first crash. > > this is a candidate for 9.0 and stable branches > > Signed-off-by: Dave Airlie > --- > src/glsl/glcpp/

Re: [Mesa-dev] [PATCH 1/2] build: Don't cross-compile GLSL builtin compiler

2012-09-14 Thread Jon TURNEY
On 14/09/2012 08:22, Thierry Reding wrote: > The builtin_compiler binary is used during the build process to generate > code for the builtin GLSL functions. Since this binary needs to be run > on the build host, it must not be cross-compiled. > > This patch fixes the build system to compile a seco

[Mesa-dev] [PATCH v2 0/2] Add VA-API / EGL interoperability

2012-09-14 Thread Gwenole Beauchesne
Hi, This patch series implements the new VA/EGL API for Intel Gen graphics. That's based on the Wayland work but applicable more generically to VA-API. The same EGL tokens than for Wayland are re-used since they represent the same things. Changes (v2): - Updated to current git master tree - Split

[Mesa-dev] [PATCH v2 1/2] egl: add initial implementation for VA/EGL interop.

2012-09-14 Thread Gwenole Beauchesne
Signed-off-by: Gwenole Beauchesne --- configure.ac| 27 include/EGL/eglmesaext.h|9 +++ include/GL/internal/dri_interface.h | 30 ++- src/egl/drivers/dri2/Makefile.am|1 + src/egl/drivers/dri2/egl_dri

[Mesa-dev] [PATCH v2 2/2] intel: implement createImageFromVABuffer() hook.

2012-09-14 Thread Gwenole Beauchesne
Signed-off-by: Gwenole Beauchesne --- src/mesa/drivers/dri/intel/intel_screen.c | 135 - 1 file changed, 133 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index e3a442c..835f915 10064

Re: [Mesa-dev] [PATCH] meta: Don't _mesa_set_enable() invalid targets in ES 1.

2012-09-14 Thread Brian Paul
On 09/14/2012 04:01 AM, Kenneth Graunke wrote: GL_TEXTURE_1D, GL_TEXTURE_RECTANGLE, and GL_TEXTURE_GEN_* don't exist in ES 1 contexts, so any meta ops that used _mesa_meta_begin with MESA_META_TEXTURE would trigger GL errors. One such operation is _mesa_meta_Clear(). Fixes the ES1 conformance t

Re: [Mesa-dev] [PATCH] meta: Refactor handling of GL_MULTISAMPLE.

2012-09-14 Thread Brian Paul
On 09/13/2012 11:50 AM, Paul Berry wrote: In commit 055093e (meta: remove call to _meta_in_progress(), fix multisample enable/disable), we created a meta_set_enable() function that could be used by meta ops to enable and disable GL_MULTISAMPLE even when the GLES API was in use (the GLES API doesn

Re: [Mesa-dev] [PATCH 1/2] build: Don't cross-compile GLSL builtin compiler

2012-09-14 Thread Thierry Reding
On Fri, Sep 14, 2012 at 02:09:26PM +0100, Jon TURNEY wrote: > On 14/09/2012 08:22, Thierry Reding wrote: > > The builtin_compiler binary is used during the build process to generate > > code for the builtin GLSL functions. Since this binary needs to be run > > on the build host, it must not be cros

[Mesa-dev] automake-gallium testing

2012-09-14 Thread Andreas Boll
Hi Matt, thank you very much for working on mesa's build system. I've tested your branch at http://cgit.freedesktop.org/~mattst88/mesa/log/?h=automake-gallium and found two regressions so far. This is the first regression: r600_dri.so: undefined symbol: _ZTIN4llvm11raw_ostreamE) I've bisected

Re: [Mesa-dev] [PATCH v2 00/45] Remove many of the FEATURE_* defines.

2012-09-14 Thread Brian Paul
On 09/14/2012 04:30 AM, Oliver McFadden wrote: On Thu, Sep 13, 2012 at 03:00:48PM -0600, Brian Paul wrote: On 09/13/2012 02:18 AM, Oliver McFadden wrote: Hi, As requested here is the second version of the patch series which removes almost all of the FEATURE_* defines, typically used to enable

[Mesa-dev] [PATCH] radeon/llvm: Support frint on SI

2012-09-14 Thread Christian König
Gets VDPAUs shaders working again. Signed-off-by: Christian König --- src/gallium/drivers/radeon/SIInstructions.td |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeon/SIInstructions.td b/src/gallium/drivers/radeon/SIInstructions.td index 0566562.

Re: [Mesa-dev] [PATCH] radeon/llvm: Support frint on SI

2012-09-14 Thread Alex Deucher
On Fri, Sep 14, 2012 at 10:35 AM, Christian König wrote: > Gets VDPAUs shaders working again. > > Signed-off-by: Christian König Reviewed-by: Alex Deucher > --- > src/gallium/drivers/radeon/SIInstructions.td |4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/ga

[Mesa-dev] [Bug 34874] --enable-shared-glapi breaks apps

2012-09-14 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=34874 Andreas Boll changed: What|Removed |Added AssignedTo|dri-devel@lists.freedesktop |mesa-dev@lists.freedesktop.

Re: [Mesa-dev] [PATCH] radeon/llvm: Support frint on SI

2012-09-14 Thread Tom Stellard
On Fri, Sep 14, 2012 at 04:35:16PM +0200, Christian König wrote: > Gets VDPAUs shaders working again. > > Signed-off-by: Christian König Reviewed-by: Tom Stellard > --- > src/gallium/drivers/radeon/SIInstructions.td |4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a

Re: [Mesa-dev] automake-gallium testing

2012-09-14 Thread Matt Turner
On Fri, Sep 14, 2012 at 6:51 AM, Andreas Boll wrote: > Hi Matt, > > thank you very much for working on mesa's build system. > I've tested your branch at > http://cgit.freedesktop.org/~mattst88/mesa/log/?h=automake-gallium > and found two regressions so far. > > This is the first regression: > r6

Re: [Mesa-dev] [PATCH 1/2] build: Don't cross-compile GLSL builtin compiler

2012-09-14 Thread Matt Turner
On Fri, Sep 14, 2012 at 12:22 AM, Thierry Reding wrote: > The builtin_compiler binary is used during the build process to generate > code for the builtin GLSL functions. Since this binary needs to be run > on the build host, it must not be cross-compiled. > > This patch fixes the build system to c

Re: [Mesa-dev] [PATCH 1/2] build: Don't cross-compile GLSL builtin compiler

2012-09-14 Thread Matt Turner
On Fri, Sep 14, 2012 at 8:37 AM, Matt Turner wrote: > On Fri, Sep 14, 2012 at 12:22 AM, Thierry Reding > wrote: >> The builtin_compiler binary is used during the build process to generate >> code for the builtin GLSL functions. Since this binary needs to be run >> on the build host, it must not b

Re: [Mesa-dev] [PATCH] intel: Improve teximage perf for Google Chrome paint rects

2012-09-14 Thread Paul Berry
On 11 September 2012 12:04, Chad Versace wrote: > This patch adds a new fast path for glTexImage2D and glTexSubImage2D, > intel_texsubimage_tiled_memcpy, which is optimized for Google Chrome's > paint rectangles. The fast path is implemented only for 2D GL_BGRA > textures on gen >= 6. > > Reduces

[Mesa-dev] [PATCH 00/23] Gallium blit rework

2012-09-14 Thread Marek Olšák
This series reworks blitting and MSAA resolving in Gallium as discussed here: http://www.mail-archive.com/mesa-dev@lists.freedesktop.org/msg26592.html I'd like to clarify some more rules for the blit function: - Z/S blitting must always be supported regardless of shader stencil export and sampler

[Mesa-dev] [PATCH 01/23] draw: fix non-indexed draw calls if there's an index buffer

2012-09-14 Thread Marek Olšák
pipe_draw_info::indexed determines if it should be indexed and not the presence of an index buffer. This fixes crashes in r300g. NOTE: This is a candidate for the stable branches. --- src/gallium/auxiliary/draw/draw_context.c |2 +- src/gallium/auxiliary/draw/draw_private.h |1 + src/gal

[Mesa-dev] [PATCH 02/23] softpipe: fix set_framebuffer_state with uninitialized surfaces past nr_cbufs-1

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/softpipe/sp_state_surface.c |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/softpipe/sp_state_surface.c b/src/gallium/drivers/softpipe/sp_state_surface.c index 2db6fae..c0bd1f7 100644 --- a/src/gallium/drivers/softpipe/sp_

[Mesa-dev] [PATCH 03/23] gallium: add PIPE_CAP_TEXTURE_MULTISAMPLE

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/i915/i915_screen.c |1 + src/gallium/drivers/llvmpipe/lp_screen.c |1 + src/gallium/drivers/nv30/nv30_screen.c |1 + src/gallium/drivers/nv50/nv50_screen.c |1 + src/gallium/drivers/nvc0/nvc0_screen.c |1 + src/gallium/drivers/r300/r300_screen.c

[Mesa-dev] [PATCH 04/23] gallium: add blit into the interface

2012-09-14 Thread Marek Olšák
--- src/gallium/docs/source/context.rst |9 + src/gallium/include/pipe/p_context.h |7 +++ src/gallium/include/pipe/p_state.h | 21 + 3 files changed, 37 insertions(+) diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.

[Mesa-dev] [PATCH 05/23] gallium/u_blitter: check PIPE_CAP_TEXTURE_MULTISAMPLE

2012-09-14 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blitter.c |8 1 file changed, 8 insertions(+) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 35b8edb..b94366b 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_b

[Mesa-dev] [PATCH 06/23] gallium/u_blitter: facilitate co-existence with the Draw module

2012-09-14 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blitter.c | 168 +--- src/gallium/auxiliary/util/u_blitter.h |2 + 2 files changed, 111 insertions(+), 59 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index b94366b..3f0

[Mesa-dev] [PATCH 07/23] gallium/u_blitter: add ability to disable and restore the render condition

2012-09-14 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blitter.c | 36 src/gallium/auxiliary/util/u_blitter.h | 12 +++ src/gallium/drivers/r600/r600_blit.c | 17 +-- src/gallium/drivers/r600/r600_pipe.h |2 -- 4 files changed, 53 insertions(+), 14 dele

[Mesa-dev] [PATCH 09/23] gallium/u_blitter: add helper for blitting via resource_copy_region

2012-09-14 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blitter.c | 136 src/gallium/auxiliary/util/u_blitter.h |4 + 2 files changed, 140 insertions(+) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 2d20d70..cab7484 100644 --- a

[Mesa-dev] [PATCH 10/23] gallium: add helpers for dumping pipe_box and pipe_blit_info

2012-09-14 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_dump.h |6 +++ src/gallium/auxiliary/util/u_dump_state.c | 73 + 2 files changed, 79 insertions(+) diff --git a/src/gallium/auxiliary/util/u_dump.h b/src/gallium/auxiliary/util/u_dump.h index 87d84be..71750a6 100644 --- a/s

[Mesa-dev] [PATCH 11/23] gallium: implement blit in driver wrappers

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/galahad/glhd_context.c | 26 +++ src/gallium/drivers/identity/id_context.c | 15 ++ src/gallium/drivers/noop/noop_pipe.c |7 +++ src/gallium/drivers/trace/tr_context.c | 23 ++ src/gallium/drivers/trace/tr_dump_state.c | 69 ++

[Mesa-dev] [PATCH 12/23] i915g: implement blit

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/i915/i915_context.c | 11 +++-- src/gallium/drivers/i915/i915_surface.c | 73 +++ 2 files changed, 61 insertions(+), 23 deletions(-) diff --git a/src/gallium/drivers/i915/i915_context.c b/src/gallium/drivers/i915/i915_context.c index 988d65

[Mesa-dev] [PATCH 13/23] llvmpipe: implement blit

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/llvmpipe/lp_context.c | 12 ++ src/gallium/drivers/llvmpipe/lp_context.h |3 ++ src/gallium/drivers/llvmpipe/lp_screen.c |4 ++ src/gallium/drivers/llvmpipe/lp_surface.c | 61 + 4 files changed, 80 insertions(+) diff --git a/src

[Mesa-dev] [PATCH 14/23] nv30: use util_format_is_supported

2012-09-14 Thread Marek Olšák
Hardware drivers *must* use it. --- src/gallium/drivers/nv30/nv30_screen.c | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/nv30/nv30_screen.c b/src/gallium/drivers/nv30/nv30_screen.c index c9e5c97..18ad3a8 100644 --- a/src/gallium/drivers/n

[Mesa-dev] [PATCH 15/23] nv30: implement blit

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/nv30/nv30_context.c |9 + src/gallium/drivers/nv30/nv30_context.h |5 +++ src/gallium/drivers/nv30/nv30_miptree.c | 58 ++ src/gallium/drivers/nv30/nv30_query.c|3 ++ src/gallium/drivers/nv30/nv30_resource.c |1 + src

[Mesa-dev] [PATCH 16/23] r300g: implement blit

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/r300/r300_blit.c | 40 ++ 1 file changed, 40 insertions(+) diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index 3e82176..96c96c3 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium

[Mesa-dev] [PATCH 17/23] r600g: implement blit

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/r600/evergreen_state.c |2 + src/gallium/drivers/r600/r600_blit.c | 144 +++--- src/gallium/drivers/r600/r600_pipe.h |4 +- src/gallium/drivers/r600/r600_state.c|8 +- src/gallium/drivers/r600/r600_state_common.c |

[Mesa-dev] [PATCH 18/23] radeonsi: implement blit

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/radeonsi/r600_blit.c | 28 1 file changed, 28 insertions(+) diff --git a/src/gallium/drivers/radeonsi/r600_blit.c b/src/gallium/drivers/radeonsi/r600_blit.c index e599deb..eecdb60 100644 --- a/src/gallium/drivers/radeonsi/r600_blit.c +++ b/s

[Mesa-dev] [PATCH 19/23] softpipe: implement blit

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/softpipe/sp_context.c | 11 ++ src/gallium/drivers/softpipe/sp_context.h |3 ++ src/gallium/drivers/softpipe/sp_surface.c | 55 + 3 files changed, 69 insertions(+) diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium

[Mesa-dev] [PATCH 20/23] svga: implement blit

2012-09-14 Thread Marek Olšák
--- src/gallium/drivers/svga/svga_context.c|2 + src/gallium/drivers/svga/svga_context.h|2 + src/gallium/drivers/svga/svga_pipe_blit.c | 64 src/gallium/drivers/svga/svga_swtnl_draw.c | 10 + 4 files changed, 78 insertions(+) diff --git a/src

[Mesa-dev] [PATCH 21/23] st/mesa: implement BlitFramebuffer using gallium blit

2012-09-14 Thread Marek Olšák
This also fixes a lot tests, especially all the clip-and-scissor-blit MSAA piglit tests. --- src/mesa/main/image.c |4 +- src/mesa/state_tracker/st_cb_blit.c | 326 --- 2 files changed, 149 insertions(+), 181 deletions(-) diff --git a/src/mesa/ma

[Mesa-dev] [PATCH 22/23] st/mesa: implement decompress_with_blit using gallium blit

2012-09-14 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_surface.c | 30 ++ src/gallium/auxiliary/util/u_surface.h | 11 + src/mesa/state_tracker/st_cb_texture.c | 70 +++- 3 files changed, 28 insertions(+), 83 deletions(-) diff --git a/src/gallium/auxiliary/util/u_surfa

[Mesa-dev] [PATCH 23/23] gallium: remove resource_resolve

2012-09-14 Thread Marek Olšák
The functionality is provided by the new blit function. --- src/gallium/docs/d3d11ddi.txt |2 +- src/gallium/docs/source/context.rst| 14 -- src/gallium/drivers/galahad/glhd_context.c |1 - src/gallium/drivers/nv30/nv30_miptree.c|

Re: [Mesa-dev] [PATCH 00/23] Gallium blit rework

2012-09-14 Thread Marek Olšák
And BTW, you can also get it from here: git://people.freedesktop.org/~mareko/mesa blit Marek On Fri, Sep 14, 2012 at 7:09 PM, Marek Olšák wrote: > This series reworks blitting and MSAA resolving in Gallium as discussed here: > http://www.mail-archive.com/mesa-dev@lists.freedesktop.org/msg26592.

Re: [Mesa-dev] [PATCH 1/2] build: Don't cross-compile GLSL builtin compiler

2012-09-14 Thread Thierry Reding
On Fri, Sep 14, 2012 at 08:40:48AM -0700, Matt Turner wrote: > On Fri, Sep 14, 2012 at 8:37 AM, Matt Turner wrote: > > On Fri, Sep 14, 2012 at 12:22 AM, Thierry Reding > > wrote: > >> The builtin_compiler binary is used during the build process to generate > >> code for the builtin GLSL functions

Re: [Mesa-dev] [PATCH 1/2] build: Don't cross-compile GLSL builtin compiler

2012-09-14 Thread Thierry Reding
On Fri, Sep 14, 2012 at 08:37:43AM -0700, Matt Turner wrote: > On Fri, Sep 14, 2012 at 12:22 AM, Thierry Reding > wrote: > > The builtin_compiler binary is used during the build process to generate > > code for the builtin GLSL functions. Since this binary needs to be run > > on the build host, it

Re: [Mesa-dev] [PATCH] meta: Don't _mesa_set_enable() invalid targets in ES 1.

2012-09-14 Thread Kenneth Graunke
On 09/14/2012 06:05 AM, Brian Paul wrote: > On 09/14/2012 04:01 AM, Kenneth Graunke wrote: >> GL_TEXTURE_1D, GL_TEXTURE_RECTANGLE, and GL_TEXTURE_GEN_* don't exist in >> ES 1 contexts, so any meta ops that used _mesa_meta_begin with >> MESA_META_TEXTURE would trigger GL errors. One such operation

Re: [Mesa-dev] [PATCH] meta: Refactor handling of GL_MULTISAMPLE.

2012-09-14 Thread Kenneth Graunke
On 09/13/2012 10:50 AM, Paul Berry wrote: > In commit 055093e (meta: remove call to _meta_in_progress(), fix > multisample enable/disable), we created a meta_set_enable() function > that could be used by meta ops to enable and disable GL_MULTISAMPLE > even when the GLES API was in use (the GLES API

Re: [Mesa-dev] [PATCH] radeon/llvm: Convert to Automake

2012-09-14 Thread Thierry Reding
On Thu, Aug 30, 2012 at 12:55:29PM -0400, tstel...@gmail.com wrote: > diff --git a/configure.ac b/configure.ac > index c984b9c..46b53fd 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1876,6 +1876,9 @@ if test "x$with_gallium_drivers" != x; then > if test "x$enable_opencl" = xye

Re: [Mesa-dev] [PATCH] radeon/llvm: Convert to Automake

2012-09-14 Thread Matt Turner
On Fri, Sep 14, 2012 at 12:29 PM, Thierry Reding wrote: > On Thu, Aug 30, 2012 at 12:55:29PM -0400, tstel...@gmail.com wrote: >> diff --git a/configure.ac b/configure.ac >> index c984b9c..46b53fd 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -1876,6 +1876,9 @@ if test "x$with_gallium_dr

Re: [Mesa-dev] [PATCH 1/2] build: Don't cross-compile GLSL builtin compiler

2012-09-14 Thread Kenneth Graunke
On 09/14/2012 12:22 AM, Thierry Reding wrote: > The builtin_compiler binary is used during the build process to generate > code for the builtin GLSL functions. Since this binary needs to be run > on the build host, it must not be cross-compiled. > > This patch fixes the build system to compile a s

[Mesa-dev] [PATCH] Use signbit() in IS_NEGATIVE and DIFFERENT_SIGNS

2012-09-14 Thread Matt Turner
signbit() appears to be available everywhere (even MSVC according to MSDN), so let's use it instead of open-coding some messy and confusing bit twiddling macros. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54805 Cc: Alan Coopersmith Suggested-by: Ian Romanick --- I'd prefer to see if

Re: [Mesa-dev] Proposal for an Updated Linux OpenGL ABI

2012-09-14 Thread Andy Ritger
On Thu, Sep 13, 2012 at 09:05:03AM -0700, Kristian Høgsberg wrote: > On Wed, Sep 12, 2012 at 5:09 PM, Andy Ritger wrote: > > There was some recent Khronos discussion about updating the OpenGL > > Implementer's Guide for Linux, to which Ian Romanick noted that this > > topic will be discussed at XD

Re: [Mesa-dev] Proposal for an Updated Linux OpenGL ABI

2012-09-14 Thread Andy Ritger
On Thu, Sep 13, 2012 at 03:19:44PM -0700, Brian Paul wrote: > On 09/12/2012 03:09 PM, Andy Ritger wrote: > > There was some recent Khronos discussion about updating the OpenGL > > Implementer's Guide for Linux, to which Ian Romanick noted that this > > topic will be discussed at XDC as part of the

Re: [Mesa-dev] Proposal for an Updated Linux OpenGL ABI

2012-09-14 Thread Andy Ritger
On Thu, Sep 13, 2012 at 11:55:06PM -0700, Kenneth Graunke wrote: > On 09/12/2012 02:09 PM, Andy Ritger wrote: > > There was some recent Khronos discussion about updating the OpenGL > > Implementer's Guide for Linux, to which Ian Romanick noted that this > > topic will be discussed at XDC as part of

Re: [Mesa-dev] Proposal for an Updated Linux OpenGL ABI

2012-09-14 Thread Andy Ritger
On Fri, Sep 14, 2012 at 12:17:26AM -0700, Ian Romanick wrote: > On 09/13/2012 12:09 AM, Andy Ritger wrote: > > There was some recent Khronos discussion about updating the OpenGL > > Implementer's Guide for Linux, to which Ian Romanick noted that this > > topic will be discussed at XDC as part of th

[Mesa-dev] [PATCH] mesa: make global perm variable static const

2012-09-14 Thread Dave Airlie
this array doesn't look like it needs to be global or unconst. Signed-off-by: Dave Airlie --- src/mesa/program/prog_noise.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/program/prog_noise.c b/src/mesa/program/prog_noise.c index 1713ddb..75cd8c6 100644 --- a/src/me

[Mesa-dev] [PATCH] ir_to_mesa: make some global variable static

2012-09-14 Thread Dave Airlie
nothing outside this file uses these. Signed-off-by: Dave Airlie --- src/mesa/program/ir_to_mesa.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index c9c6db1..4991a55 100644 --- a/src/mesa/program/ir

[Mesa-dev] [PATCH] glsl: make builtin_mem_ctx a static

2012-09-14 Thread Dave Airlie
This isn't used outside the generated file. Signed-off-by: Dave Airlie --- src/glsl/builtins/tools/generate_builtins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py index 86660a9..

[Mesa-dev] [PATCH 1/4] mesa/dxtn: make function pointers static

2012-09-14 Thread Dave Airlie
These aren't used outside thie file from what I can see. Signed-off-by: Dave Airlie --- src/mesa/main/texcompress_s3tc.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c index 8736e20..b5d7d3b 100644 -

[Mesa-dev] [PATCH 2/4] glsl: make tex_opcode_strs static

2012-09-14 Thread Dave Airlie
No reason for this to be global from what I can see Signed-off-by: Dave Airlie --- src/glsl/ir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index f59cdd2..1c7aada 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -1282,7 +1282,7 @@

[Mesa-dev] [PATCH 3/4] mesa/ati_fragshader: no need for opcodes to be global.

2012-09-14 Thread Dave Airlie
I can't see these in use anywhere outside this file. Signed-off-by: Dave Airlie --- src/mesa/main/atifragshader.h | 2 -- src/mesa/swrast/s_atifragshader.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h inde

[Mesa-dev] [PATCH 4/4] mesa/fxt1: make fxt1_decode_1 static

2012-09-14 Thread Dave Airlie
No users outside this file. Signed-off-by: Dave Airlie --- src/mesa/main/texcompress_fxt1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index 92af29a..3fc7dab 100644 --- a/src/mesa/main/texcompress_fx

[Mesa-dev] [PATCH] vbo: add a prefix to count_tessellated_primitives

2012-09-14 Thread Dave Airlie
Just to make it consistent with the rest of vbo, since it would be an exported symbol anyways. Signed-off-by: Dave Airlie --- src/mesa/drivers/dri/i965/brw_draw.c | 2 +- src/mesa/vbo/vbo.h | 2 +- src/mesa/vbo/vbo_exec.c | 2 +- 3 files changed, 3 insertions(+), 3

[Mesa-dev] [PATCH] glsl: make _mesa_builtin_uniform_desc static

2012-09-14 Thread Dave Airlie
I can't see any reason this is global (unless for debugging) Signed-off-by: Dave Airlie --- src/glsl/builtin_variables.cpp | 2 +- src/mesa/main/uniforms.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp

Re: [Mesa-dev] [PATCH 2/2] mesa/glsl: rename preprocess to glcpp_preprocess

2012-09-14 Thread Mathias Fröhlich
Hi, On Friday, September 14, 2012 00:08:27 Kenneth Graunke wrote: > I wonder if there's something better we can do. I don't know what though. Is there any deep reason why we use RTLD_GLOBAL for dlopening the drivers? If not we could use RTLD_LOCAL | RTLD_DEEPBIND instead of RTLD_GLOBAL. This

Re: [Mesa-dev] [PATCH] meta: Don't _mesa_set_enable() invalid targets in ES 1.

2012-09-14 Thread Ian Romanick
On 09/14/2012 01:01 PM, Kenneth Graunke wrote: GL_TEXTURE_1D, GL_TEXTURE_RECTANGLE, and GL_TEXTURE_GEN_* don't exist in ES 1 contexts, so any meta ops that used _mesa_meta_begin with MESA_META_TEXTURE would trigger GL errors. One such operation is _mesa_meta_Clear(). Fixes the ES1 conformance t

[Mesa-dev] [PATCH] i915: Don't flatten IF statements in the vertex shader.

2012-09-14 Thread Kenneth Graunke
MaxIfDepth of 0 means "flatten all the time", not "never flatten". Vertex shading is done using swrast, which can handle control flow just fine. Giving it less instructions will probably help performance. Signed-off-by: Kenneth Graunke --- src/mesa/drivers/dri/i915/i915_context.c | 1 + 1 file

Re: [Mesa-dev] Proposal for an Updated Linux OpenGL ABI

2012-09-14 Thread Kenneth Graunke
On 09/14/2012 04:53 PM, Andy Ritger wrote: > On Thu, Sep 13, 2012 at 11:55:06PM -0700, Kenneth Graunke wrote: >> On 09/12/2012 02:09 PM, Andy Ritger wrote: >>> There was some recent Khronos discussion about updating the OpenGL >>> Implementer's Guide for Linux, to which Ian Romanick noted that this

[Mesa-dev] [Bug 54951] New: ld: duplicate symbol _mem_ctx on Mac OS X

2012-09-14 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54951 Bug #: 54951 Summary: ld: duplicate symbol _mem_ctx on Mac OS X Classification: Unclassified Product: Mesa Version: git Platform: x86-64 (AMD64) OS/Version: Mac OS X (All)

Re: [Mesa-dev] [PATCH 1/4] mesa/dxtn: make function pointers static

2012-09-14 Thread Kenneth Graunke
On 09/14/2012 08:18 PM, Dave Airlie wrote: > These aren't used outside thie file from what I can see. > > Signed-off-by: Dave Airlie > --- > src/mesa/main/texcompress_s3tc.c | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/mesa/main/texcompress_s3tc.c > b/sr

Re: [Mesa-dev] [PATCH] vbo: add a prefix to count_tessellated_primitives

2012-09-14 Thread Kenneth Graunke
On 09/14/2012 08:23 PM, Dave Airlie wrote: > Just to make it consistent with the rest of vbo, since it would > be an exported symbol anyways. > > Signed-off-by: Dave Airlie Reviewed-by: Kenneth Graunke ___ mesa-dev mailing list mesa-dev@lists.freedes