[Mesa-dev] [PATCH 05/11 v5] gbm dri backend: add YUYV support

2012-07-09 Thread Zhao Halley
--- src/gbm/backends/dri/gbm_dri.c |9 + src/gbm/main/gbm.h |5 - 2 files changed, 13 insertions(+), 1 deletions(-) mode change 100644 => 100755 src/gbm/backends/dri/gbm_dri.c mode change 100644 => 100755 src/gbm/main/gbm.h diff --git a/src/gbm/backends/dri/gbm_d

[Mesa-dev] [PATCH 03/11 v5] egl wayland: add YUYV support

2012-07-09 Thread Zhao Halley
--- src/egl/drivers/dri2/platform_wayland.c |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) mode change 100644 => 100755 src/egl/drivers/dri2/platform_wayland.c diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c old mode 100644 new mo

[Mesa-dev] [PATCH 07/11 v5] gbm: add shared_handle(drm buffer region name)

2012-07-09 Thread Zhao Halley
it can be shared among processed --- src/gbm/backends/dri/gbm_dri.c | 13 + src/gbm/main/gbm.c | 18 ++ src/gbm/main/gbm.h |3 +++ src/gbm/main/gbmint.h |2 ++ 4 files changed, 36 insertions(+), 0 deletions(-) mode change

[Mesa-dev] [PATCH 06/11 v5] wayland-drm: add YUYV support

2012-07-09 Thread Zhao Halley
--- src/egl/wayland/wayland-drm/wayland-drm.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/egl/wayland/wayland-drm/wayland-drm.c diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c old mode 100644 ne

[Mesa-dev] [PATCH 08/11 v5] intel driver: dri image write update

2012-07-09 Thread Zhao Halley
add tiling support for intel_image_write() all drm image can be written from app --- src/mesa/drivers/dri/intel/intel_screen.c | 17 +++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/i

[Mesa-dev] [PATCH 10/11 v5] EGL: add YUYV support to eglCreateImageKHR and eglCreateDRMImageMESA

2012-07-09 Thread Zhao Halley
--- include/EGL/eglmesaext.h|3 +++ src/egl/drivers/dri2/egl_dri2.c |9 - 2 files changed, 11 insertions(+), 1 deletions(-) mode change 100644 => 100755 include/EGL/eglext.h mode change 100644 => 100755 include/EGL/eglmesaext.h diff --git a/include/EGL/eglext.h b/include

[Mesa-dev] [PATCH 09/11 v5] test: test case drm-test-client in src/egl/wayland/wayland-drm

2012-07-09 Thread Zhao Halley
- it shows how wayland-drm protocol works between server and client buffer are shared basing on dri image - XRGB and YUYV format are supported, it can render to overlay plane potentially --- src/egl/wayland/wayland-drm/Makefile.am | 15 +- src/egl/wayland/wayland-drm/drm-test-clien

[Mesa-dev] [PATCH 11/11 v5] [piglit] add egl-create-drm-image test

2012-07-09 Thread Zhao Halley
--- tests/egl/CMakeLists.gl.txt |2 + tests/egl/egl-create-drm-image.c | 145 ++ 2 files changed, 147 insertions(+), 0 deletions(-) create mode 100755 tests/egl/egl-create-drm-image.c diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl

[Mesa-dev] [PATCH] es2tri: Define precision in fragment shader

2012-07-09 Thread Shuang He
According to GLSL ES spec, section 4.5.2: "If the precision cannot be determined by this method e.g. if an entire expression is composed only of operands with no precision qualifier, and the result is not assigned or passed as an argument, then it is evaluated at the default precision of the typ

[Mesa-dev] [PATCH 0/9] Automake continued

2012-07-09 Thread Jon TURNEY
On 13/06/2012 18:30, Eric Anholt wrote: > Here's a bunch more automake. We're at the point that an enterprising > person could potentially convert libmesa.a if they figure out how to > work that into the gallium build. I also haven't converted osmesa, > because I didn't think I knew of any tests

[Mesa-dev] [PATCH 1/9] automake: convert libOSmesa building

2012-07-09 Thread Jon TURNEY
From: Laurent Carlier This also currently fix the installation of libOSmesa. v2: Remove old Makefile, libOSmesa is now versioned, fix typos v3: Keep config substitution alphabetized v4: Update .gitignore Reviewed-by: Jon TURNEY --- configure.ac|5 +++ src/mesa/driv

[Mesa-dev] [PATCH 2/9] automake: convert libglsl building

2012-07-09 Thread Jon TURNEY
Signed-off-by: Jon TURNEY --- configure.ac|2 + src/glsl/.gitignore |1 + src/glsl/Makefile | 144 --- src/glsl/Makefile.am| 111 +++ src/glsl/glcpp/.gitigno

[Mesa-dev] [PATCH 4/9] automake: convert libmesa and libmesagallium

2012-07-09 Thread Jon TURNEY
Signed-off-by: Jon TURNEY --- src/glsl/tests/Makefile.am |2 +- src/mesa/Makefile.am| 45 +-- src/mesa/Makefile.old | 57 +-- src/mesa/drivers/osmesa/Makefile.am |2 +- src/mesa/drivers/x11/

[Mesa-dev] [PATCH 5/9] Remove unused MESA_MODULES autoconf variable

2012-07-09 Thread Jon TURNEY
--- configs/current.in |1 - configure.ac |3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/configs/current.in b/configs/current.in index f4858bd..ca817c4 100644 --- a/configs/current.in +++ b/configs/current.in @@ -147,7 +147,6 @@ VG_LIB_DEPS = $(EXTRA_LIB_PATH)

[Mesa-dev] [PATCH 6/9] Link dri drivers with mesa or dricore libtool library

2012-07-09 Thread Jon TURNEY
Now mesa/drivers/dri is converted to automake, we want to update DRI_LIB_DEPS so that we link with the libmesa or libdricore libtool library, as appropriate. However, this is complicated by the fact that gallium/targets is not (yet) converted, so we can't share the DRI_LIB_DEPS autoconf variable w

[Mesa-dev] [PATCH 3/9] Rename sparc/clip.S -> sparc/sparc_clip.S

2012-07-09 Thread Jon TURNEY
Automake can't handle having both clip.S and clip.c, even though they have different paths "src/mesa/Makefile.am: object `clip.lo' created by `$(SRCDIR)/sparc/clip.S' and `$(SRCDIR)/main/clip.c'" Signed-off-by: Jon TURNEY --- src/mesa/SConscript |2 +- src/mesa/sources.mak

[Mesa-dev] [PATCH 8/9] automake: convert libglapi

2012-07-09 Thread Jon TURNEY
* "configure substitutions are not allowed in _SOURCES variables" in automake, so remove the AC_SUBST'ed GLAPI_ASM_SOURCES and instead use some AM_CONDITIONALS to choose which asm sources are used * Change GLAPI_LIB to point to the .la file in other Makefile.am files, and make a link to the .a fi

[Mesa-dev] [PATCH 9/9] Don't explicitly link libOsmesa with libmesa's dependency libglapi

2012-07-09 Thread Jon TURNEY
We must either: (i) Not link libmesa with libglapi, and link anything that uses libmesa with libglapi as well, or (ii) Link libmesa with libglapi, and not link anything that uses libmesa with libglapi I choose (ii) just because it's least change, but I'm not sure it's right. Note that drivers/X11

[Mesa-dev] [PATCH 7/9] Rename X86-64_API -> X86_64_API

2012-07-09 Thread Jon TURNEY
automake doesn't allow hyphens in variable names Signed-off-by: Jon TURNEY --- configure.ac |2 +- src/mapi/glapi/sources.mak |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 216ec3b..c7a42cb 100644 --- a/configure.ac +

Re: [Mesa-dev] [PATCH 3/9] Rename sparc/clip.S -> sparc/sparc_clip.S

2012-07-09 Thread Jan Engelhardt
On Monday 2012-07-09 13:41, Jon TURNEY wrote: >Automake can't handle having both clip.S and clip.c, even though they >have different paths >"src/mesa/Makefile.am: object `clip.lo' created by `$(SRCDIR)/sparc/clip.S' >and `$(SRCDIR)/main/clip.c'" It should - have you tried AM_INIT_AUTOMAKE([subd

Re: [Mesa-dev] [PATCH] Make it possible to install gl.pc and osmesa.pc together.

2012-07-09 Thread Johannes Obermayr
Am Sonntag, 8. Juli 2012, 19:41:33 schrieb Kenneth Graunke: > On 07/08/2012 03:12 PM, Johannes Obermayr wrote: > > --- > > configure.ac |1 + > > src/mesa/Makefile.am |9 ++--- > > 2 files changed, 7 insertions(+), 3 deletions(-) > > It's never been clear to me whether one can

Re: [Mesa-dev] [PATCH 9/9] Don't explicitly link libOsmesa with libmesa's dependency libglapi

2012-07-09 Thread Eric Anholt
Jon TURNEY writes: > We must either: > (i) Not link libmesa with libglapi, and link anything that uses libmesa with > libglapi as well, or > (ii) Link libmesa with libglapi, and not link anything that uses libmesa with > libglapi > > I choose (ii) just because it's least change, but I'm not sure

Re: [Mesa-dev] [PATCH 0/9] Automake continued

2012-07-09 Thread Eric Anholt
Jon TURNEY writes: > On 13/06/2012 18:30, Eric Anholt wrote: >> Here's a bunch more automake. We're at the point that an enterprising >> person could potentially convert libmesa.a if they figure out how to >> work that into the gallium build. I also haven't converted osmesa, >> because I didn't

Re: [Mesa-dev] [PATCH 1/4] mesa: implement glGet(GL_TIMESTAMP) v2

2012-07-09 Thread Eric Anholt
Marek Olšák writes: > This is adds a new driver function to retrieve the timestamp. Reviewed-by: Eric Anholt pgpiAIdFyMQAr.pgp Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/

Re: [Mesa-dev] [PATCH] Make it possible to install gl.pc and osmesa.pc together.

2012-07-09 Thread Eric Anholt
osmesa didn't install gl.pc in the past as far as I can see, and I don't think it should -- it's not a normal GL implementation, so you want to be specifically looking for osmesa in your pkgconfig checks. pgp9AaCd4EExB.pgp Description: PGP signature ___

Re: [Mesa-dev] [PATCH 4/9] automake: convert libmesa and libmesagallium

2012-07-09 Thread Eric Anholt
Jon TURNEY writes: > diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am > index bada760..08beaa6 100644 > --- a/src/mesa/Makefile.am > +++ b/src/mesa/Makefile.am > +libmesa_la_SOURCES = \ > + $(MESA_FILES) \ > + $(MESA_CXX_FILES) \ > +$(MESA_ASM_FILES_FOR_ARCH) > + > +libmes

Re: [Mesa-dev] [PATCH 3/9] Rename sparc/clip.S -> sparc/sparc_clip.S

2012-07-09 Thread Eric Anholt
Jan Engelhardt writes: > On Monday 2012-07-09 13:41, Jon TURNEY wrote: > >>Automake can't handle having both clip.S and clip.c, even though they >>have different paths >>"src/mesa/Makefile.am: object `clip.lo' created by `$(SRCDIR)/sparc/clip.S' >>and `$(SRCDIR)/main/clip.c'" > > It should - ha

[Mesa-dev] [PATCH 0/5] intel: Enable GL_OES_compressed_ETC1_RGB8_texture

2012-07-09 Thread Chad Versace
This series enables it for all hardware. The implementation simply decodes the ETC1 data into RGB at time of glTexImage, so no hardware support is needed. This series lives on my etc1-v8 branch. Tested against pending Piglit test OES_compressed_ETC1_RGB8_texture/miptree, which lives on my Piglit e

[Mesa-dev] [PATCH 1/5] mesa: Fold texcompress_etc1_tmp.h into texcompress_etc.c

2012-07-09 Thread Chad Versace
The header defined the functions in with C-style macro templates. Since there was only one user of the header, the templates were unnecessary. This patch redefines the functions as vanilla, non-templated functions. This patch also removes the header and folds its contents into texcompress_etc.c.

[Mesa-dev] [PATCH 2/5] mesa: Remove unneeded extern qualifiers

2012-07-09 Thread Chad Versace
Remove 'extern' from the functions declared in texcompress_etc.h. Signed-off-by: Chad Versace --- src/mesa/main/texcompress_etc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/texcompress_etc.h b/src/mesa/main/texcompress_etc.h index 4e166b2..8e8427f 10064

[Mesa-dev] [PATCH 3/5] mesa: Document some etc1 functions

2012-07-09 Thread Chad Versace
- Add doxygen to etc1_texel_fetch(). - Rename ambiguously named `dst` variables to `bgr888` in order to be better self-documenting. Signed-off-by: Chad Versace --- src/mesa/main/texcompress_etc.c | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/me

[Mesa-dev] [PATCH 4/5] mesa: Add function for decoding ETC1 textures

2012-07-09 Thread Chad Versace
Add function _mesa_etc1_image_decode_to_abgr(). It is intended to be used by glCompressedTexSubImage2D to translate ETC1 textures into ABGR. Signed-off-by: Chad Versace --- src/mesa/main/texcompress_etc.c | 82 + src/mesa/main/texcompress_etc.h | 6 ++

[Mesa-dev] [PATCH 5/5] intel: Enable GL_OES_compressed_ETC1_RGB8_texture

2012-07-09 Thread Chad Versace
Enable it for all hardware. No current hardware supports ETC1, so this patch implements it by translating the ETC1 data to RGBX data during the call to glCompressedTexImage2D(). For details, see the doxygen for intel_mipmap_tree::wraps_etc1. Tested on Sandybridge with Piglit test OES_compressed_E

Re: [Mesa-dev] [PATCH] Make it possible to install gl.pc and osmesa.pc together.

2012-07-09 Thread Johannes Obermayr
Am Montag, 9. Juli 2012, 09:45:56 schrieb Eric Anholt: > osmesa didn't install gl.pc in the past as far as I can see, and I don't > think it should -- it's not a normal GL implementation, so you want to > be specifically looking for osmesa in your pkgconfig checks. Mesa-demos require gl.pc (line 2

[Mesa-dev] [PATCH] i965: Revert the VBOs-in-system-memory hack by Chris.

2012-07-09 Thread Eric Anholt
It didn't change performance on Lightsmark or Nexuiz, which both used DYNAMIC_DRAW buffers, but it was killing performance (40% CPU wasted pwriting buffers) on a closed-source app we're looking at. --- src/mesa/drivers/dri/intel/intel_buffer_objects.c | 13 + 1 file changed, 5 insert

[Mesa-dev] [PATCH 1/2] i965: Rip out system memory backing for buffer objects; just use BOs.

2012-07-09 Thread Kenneth Graunke
In one workload, 45% of CPU time was spent in pwrite(), primarily uploading large amounts of VBO data. This was in fact the hottest path in the application, according to sysprof. Removing the system memory buffer and just storing VBOs in actual BOs cut the application's CPU usage by about half, a

[Mesa-dev] [PATCH 2/2] i965: Use the blitter in intel_bufferobj_subdata for busy BOs on Gen6+.

2012-07-09 Thread Kenneth Graunke
Previously we only did this pre-Gen6, and used pwrite on Gen6+. In one workload, this cuts significant amount of overhead. Signed-off-by: Kenneth Graunke --- src/mesa/drivers/dri/intel/intel_buffer_objects.c | 26 + 1 file changed, 11 insertions(+), 15 deletions(-) diff --

Re: [Mesa-dev] [PATCH 1/2] i965: Rip out system memory backing for buffer objects; just use BOs.

2012-07-09 Thread Kenneth Graunke
On 07/09/2012 11:18 AM, Kenneth Graunke wrote: > In one workload, 45% of CPU time was spent in pwrite(), primarily > uploading large amounts of VBO data. This was in fact the hottest path > in the application, according to sysprof. Removing the system memory > buffer and just storing VBOs in actu

Re: [Mesa-dev] Private window system depth/stencil buffers

2012-07-09 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 07/04/2012 10:52 AM, Eric Anholt wrote: > We've been talking about doing this for a long time -- ignore the piece of > the GLX spec about clients sharing auxiliary buffers across address spaces, > and just allocate our own buffers. Ever since HiZ w

Re: [Mesa-dev] [PATCH 2/6] intel: Convert to using private depth/stencil buffers.

2012-07-09 Thread Chad Versace
On 07/04/2012 10:52 AM, Eric Anholt wrote: > This means that GLX buffer sharing of these no longer works. On the > other hand, just *look* at this code reduction. I enjoy seeing all this code die ;) I wish we had decided earlier to break GLX sharing before the ugly handshake code was written.

Re: [Mesa-dev] [PATCH 1/2] i965: Rip out system memory backing for buffer objects; just use BOs.

2012-07-09 Thread Chad Versace
> Eric rightly pointed out that this code is still needed by i915. So, > NAK on my patch 1/2, and > > Reviewed-by: Kenneth Graunke > > on Eric's patch. Is it possible to salvage patch 1/2 so that it only applies to post-i915? ___ mesa-dev mailing l

Re: [Mesa-dev] [PATCH v2] android: fix the build

2012-07-09 Thread Chad Versace
Tapani, Is this patch still applicable? It seems that the autoconf work has calmed down, and now is a good time to fix the Android build. -Chad On 06/07/2012 04:11 AM, Tapani Pälli wrote: > Some more of the files are now autogenerated, this caused build breakage, > patch adds generation of these

[Mesa-dev] [PATCH 00/22] Gallium and R600 improvements

2012-07-09 Thread Marek Olšák
Hi everyone, this series has two parts. Patches 1-12 are Mesa/Gallium improvements. Most importantly, this adds acceleration of stencil copying (including glBlitFramebuffer) using the shader stencil export functionality. I am afraid r600g and radeonsi are the only drivers which can make use of

[Mesa-dev] [PATCH 02/22] gallium/u_gen_mipmap: accelerate depth texture mipmap generation

2012-07-09 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_gen_mipmap.c | 84 - 1 file changed, 58 insertions(+), 26 deletions(-) diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c index 2ff1af7..a96cf6a 100644 --- a/src/gallium/auxiliary/util/

[Mesa-dev] [PATCH 01/22] mesa: remove assertions that do not allow compressed 2D_ARRAY textures

2012-07-09 Thread Marek Olšák
NOTE: This is a candidate for the 8.0 branch. --- src/mesa/main/formats.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index ccc0b17..c65c9c2 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -186

[Mesa-dev] [PATCH 03/22] gallium/u_blitter: minify depth0 when initializing last_layer

2012-07-09 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blitter.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 47d0227..99bde54 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/

[Mesa-dev] [PATCH 04/22] gallium: add util_format_stencil helper function

2012-07-09 Thread Marek Olšák
used for stencil sampler views. --- src/gallium/auxiliary/util/u_format.h | 29 + src/mesa/state_tracker/st_cb_drawpixels.c | 23 ++- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/gallium/auxiliary/util/u_format.h b/sr

[Mesa-dev] [PATCH 05/22] gallium/u_blitter: accelerate depth-stencil copying using shader stencil export

2012-07-09 Thread Marek Olšák
This fixes stencil buffer write transfers on r600g. --- src/gallium/auxiliary/util/u_blitter.c| 95 ++--- src/gallium/auxiliary/util/u_blitter.h|4 +- src/gallium/auxiliary/util/u_simple_shaders.c | 54 ++ src/gallium/auxiliary/util/u_simple_

[Mesa-dev] [PATCH 06/22] gallium/u_blitter: accelerate stencil-only copying

2012-07-09 Thread Marek Olšák
This doesn't seem to be used by anything yet, but better safe than sorry. --- src/gallium/auxiliary/util/u_blitter.c| 28 ++- src/gallium/auxiliary/util/u_simple_shaders.c | 46 + src/gallium/auxiliary/util/u_simple_shaders.h |6 3 files cha

[Mesa-dev] [PATCH 07/22] gallium/util: move pipe_tex_to_tgsi_tex helper function into u_inlines

2012-07-09 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blitter.c | 34 src/gallium/auxiliary/util/u_inlines.h | 26 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitte

[Mesa-dev] [PATCH 08/22] gallium/u_blit: don't do two copies for non-2D textures

2012-07-09 Thread Marek Olšák
Because u_blit couldn't sample a 1D, 3D, CUBE and ARRAY texture, we created a 2D texture holding a copy of one slice of the source texture (even for 1D). Let's just do it right. --- src/gallium/auxiliary/util/u_blit.c | 72 +++ 1 file changed, 39 insertions(+), 3

[Mesa-dev] [PATCH 09/22] gallium/u_blit: drop not-very-useful wrapper around util_blit_pixels_writemask

2012-07-09 Thread Marek Olšák
just rename it to util_blit_pixels --- src/gallium/auxiliary/postprocess/pp_mlaa.c |3 +- src/gallium/auxiliary/postprocess/pp_run.c |3 +- src/gallium/auxiliary/util/u_blit.c | 47 +++ src/gallium/auxiliary/util/u_blit.h | 18 +++--- src/me

[Mesa-dev] [PATCH 10/22] gallium/u_blit: remove useless memset calls

2012-07-09 Thread Marek Olšák
the structure is calloc'd. --- src/gallium/auxiliary/util/u_blit.c |6 -- 1 file changed, 6 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c index 469f249..6cdfbca 100644 --- a/src/gallium/auxiliary/util/u_blit.c +++ b/src/gallium/auxili

[Mesa-dev] [PATCH 11/22] st/mesa: set colormask to zero when blitting depth

2012-07-09 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blit.c | 12 src/mesa/state_tracker/st_cb_blit.c |4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c index 6cdfbca..30f4a93 100644 --- a/src/gallium/a

[Mesa-dev] [PATCH 12/22] st/mesa: implement accelerated stencil blitting using shader stencil export

2012-07-09 Thread Marek Olšák
--- src/gallium/auxiliary/postprocess/pp_mlaa.c |2 +- src/gallium/auxiliary/postprocess/pp_run.c |2 +- src/gallium/auxiliary/util/u_blit.c | 206 ++- src/gallium/auxiliary/util/u_blit.h |4 +- src/mesa/state_tracker/st_cb_blit.c | 3

[Mesa-dev] [PATCH 13/22] r600g: move CB_TARGET_MASK setup into new cb_misc_state

2012-07-09 Thread Marek Olšák
to remove some overhead from draw_vbo. This is a derived state. BTW, I've got no idea how compute interacts with 3D here, but it should use cb_misc_state, so that 3D and compute don't conflict. --- src/gallium/drivers/r600/evergreen_compute.c |3 +-- .../drivers/r600/evergreen_compute_i

[Mesa-dev] [PATCH 14/22] r600g: move MULTIWRITE setup into cb_misc_state for r6xx-r7xx

2012-07-09 Thread Marek Olšák
--- src/gallium/drivers/r600/r600_hw_context.c |1 - src/gallium/drivers/r600/r600_pipe.h |3 ++- src/gallium/drivers/r600/r600_state.c|4 src/gallium/drivers/r600/r600_state_common.c | 33 +++--- 4 files changed, 20 insertions(+), 21 deleti

[Mesa-dev] [PATCH 15/22] r600g: move CB_SHADER_MASK setup into cb_misc_state

2012-07-09 Thread Marek Olšák
--- src/gallium/drivers/r600/evergreen_hw_context.c |2 -- src/gallium/drivers/r600/evergreen_state.c | 13 --- src/gallium/drivers/r600/r600_hw_context.c |1 - src/gallium/drivers/r600/r600_pipe.h|6 ++--- src/gallium/drivers/r600/r600_state.c

[Mesa-dev] [PATCH 16/22] r600g: set DISABLE in CB_COLOR_CONTROL if colormask is 0

2012-07-09 Thread Marek Olšák
this will be useful for in-place DB decompression, otherwise should be harmless --- src/gallium/drivers/r600/evergreen_state.c | 10 +++--- src/gallium/drivers/r600/evergreend.h |2 ++ src/gallium/drivers/r600/r600_state.c |6 ++ src/gallium/drivers/r600/r600d.h

[Mesa-dev] [PATCH 17/22] r600g: remove is_flush from DSA state

2012-07-09 Thread Marek Olšák
we can just update the state when decompressing, there's no need to add additional info into the DSA state --- src/gallium/drivers/r600/r600_blit.c | 13 + src/gallium/drivers/r600/r600_pipe.h |3 +-- src/gallium/drivers/r600/r600_state.c|9 ++---

[Mesa-dev] [PATCH 18/22] r600g: do fine-grained depth texture flushing

2012-07-09 Thread Marek Olšák
- maintain a mask of which mipmap levels are dirty (instead of one big flag) - only flush what was requested at a given point and not the whole resource (most often only one level and one layer has to be flushed) --- src/gallium/drivers/r600/r600_blit.c | 65 +-

[Mesa-dev] [PATCH 19/22] r600g: flush depth textures bound to vertex shaders

2012-07-09 Thread Marek Olšák
This was missing/broken. There are also minor code cleanups. --- src/gallium/drivers/r600/r600_blit.c | 29 +- src/gallium/drivers/r600/r600_pipe.h |2 +- src/gallium/drivers/r600/r600_state_common.c |2 +- 3 files changed, 17 insertions(+), 16 del

[Mesa-dev] [PATCH 20/22] r600g: don't set dirty_db_mask for a flushed depth texture

2012-07-09 Thread Marek Olšák
A flush depth texture is never set as a depth buffer and never flushed. --- src/gallium/drivers/r600/r600_texture.c |2 -- 1 file changed, 2 deletions(-) diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index c34df2d..a6a83ca 100644 --- a/src/gal

[Mesa-dev] [PATCH 22/22] r600g: fix uploading non-zero mipmap levels of depth textures

2012-07-09 Thread Marek Olšák
This fixes piglit/depth-level-clamp. --- src/gallium/drivers/r600/r600_texture.c |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index a6a83ca..d16c252 100644 --- a/src/gallium/drivers/r6

[Mesa-dev] [PATCH 21/22] r600g: don't flush depth textures set as colorbuffers

2012-07-09 Thread Marek Olšák
The only case a depth buffer can be set as a color buffer is when flushing. That wasn't always the case, but now this code isn't required anymore. --- src/gallium/drivers/r600/r600_blit.c | 18 -- 1 file changed, 18 deletions(-) diff --git a/src/gallium/drivers/r600/r600_blit.c

Re: [Mesa-dev] [PATCH 1/2] i965: Rip out system memory backing for buffer objects; just use BOs.

2012-07-09 Thread Kenneth Graunke
On 07/09/2012 11:44 AM, Chad Versace wrote: >> Eric rightly pointed out that this code is still needed by i915. So, >> NAK on my patch 1/2, and >> >> Reviewed-by: Kenneth Graunke >> >> on Eric's patch. > > Is it possible to salvage patch 1/2 so that it only applies to post-i915? Sure. But then

Re: [Mesa-dev] [PATCH] Make it possible to install gl.pc and osmesa.pc together.

2012-07-09 Thread Eric Anholt
Johannes Obermayr writes: > Am Montag, 9. Juli 2012, 09:45:56 schrieb Eric Anholt: >> osmesa didn't install gl.pc in the past as far as I can see, and I don't >> think it should -- it's not a normal GL implementation, so you want to >> be specifically looking for osmesa in your pkgconfig checks.

Re: [Mesa-dev] [PATCH 2/2] i965: Use the blitter in intel_bufferobj_subdata for busy BOs on Gen6+.

2012-07-09 Thread Eric Anholt
Kenneth Graunke writes: > Previously we only did this pre-Gen6, and used pwrite on Gen6+. > In one workload, this cuts significant amount of overhead. > > Signed-off-by: Kenneth Graunke > --- > src/mesa/drivers/dri/intel/intel_buffer_objects.c | 26 > + > 1 file changed,

Re: [Mesa-dev] [PATCH 1/8] i965/msaa: Move {rt, tex}_interleaved into blorp program key.

2012-07-09 Thread Chad Versace
> @@ -192,6 +192,12 @@ struct brw_blorp_blit_prog_key > */ > unsigned tex_samples; > > + /* If tex_samples > 0, whether or not the GPU pipeline will be configured > +* to read from it as though it were an interleaved MSAA layout. False if > +* tex_samples == 0. > +*/ > +

Re: [Mesa-dev] [PATCH 2/8] i965/msaa: Add an enum to describe MSAA layout.

2012-07-09 Thread Chad Versace
On 07/06/2012 03:29 PM, Paul Berry wrote: >>From the Ivy Bridge PRM, Vol 1 Part 1, p112: > > There are three types of multisampled surface layouts designated > as follows: > - IMS Interleaved Multisampled Surface > - CMS Compressed Mulitsampled Surface > - UMS Uncompresse

Re: [Mesa-dev] [PATCH 3/8] i965/msaa: Allocate MCS buffer when CMS MSAA is in use.

2012-07-09 Thread Chad Versace
On 07/06/2012 03:29 PM, Paul Berry wrote: > To implement Gen7's CMS MSAA layout, we need an extra buffer, the MCS > (Multisample Control Surface) buffer. This patch introduces code for > allocating and deallocating the buffer, and storing a pointer to it in > the intel_mipmap_tree struct. > > No

Re: [Mesa-dev] [PATCH 4/8] i965/msaa: Add CMS MSAA settings to brw_structs.h.

2012-07-09 Thread Chad Versace
On 07/06/2012 03:29 PM, Paul Berry wrote: > Previously the DWORD used to control the CMS MSAA layout was just a > pad value, because we didn't use it. > --- > src/mesa/drivers/dri/i965/brw_structs.h | 22 -- > 1 files changed, 20 insertions(+), 2 deletions(-) The documentati

Re: [Mesa-dev] [PATCH 1/8] i965/msaa: Move {rt, tex}_interleaved into blorp program key.

2012-07-09 Thread Paul Berry
On 9 July 2012 13:35, Chad Versace wrote: > > @@ -192,6 +192,12 @@ struct brw_blorp_blit_prog_key > > */ > > unsigned tex_samples; > > > > + /* If tex_samples > 0, whether or not the GPU pipeline will be > configured > > +* to read from it as though it were an interleaved MSAA layo

Re: [Mesa-dev] [PATCH 3/8] i965/msaa: Allocate MCS buffer when CMS MSAA is in use.

2012-07-09 Thread Paul Berry
On 9 July 2012 13:36, Chad Versace wrote: > On 07/06/2012 03:29 PM, Paul Berry wrote: > > To implement Gen7's CMS MSAA layout, we need an extra buffer, the MCS > > (Multisample Control Surface) buffer. This patch introduces code for > > allocating and deallocating the buffer, and storing a point

Re: [Mesa-dev] [PATCH] configure.ac: Add --with-(gl|glu|osmesa)-lib-name options

2012-07-09 Thread Brad King
On 06/11/2012 04:37 PM, Kenneth Graunke wrote: > Oh, sorry! Lost track of this. It looks like Eric's pushed it now. Yes, thanks Eric! However, since then another commit broke the feature. The build always produces "GL" no matter the --with-gl-lib-name given. The GLU and OSMesa options still wo

[Mesa-dev] __DRIimage sub-image v2 series

2012-07-09 Thread Kristian Høgsberg
Here's the patch series with Erics suggestion and comments incorporated, and I've also added support for the packed YUYV format in this version. The changes since last series boils down to: - Use __DRI_IMAGE_FORMAT_NONE when we create a __DRIimage we don't intend to texture from, and don't e

[Mesa-dev] [PATCH v2 1/8] __DRIimage: version 5, add new formats and createSubImage

2012-07-09 Thread Kristian Høgsberg
The additions in version 5 enables creating EGLImages for different planes of a YUV buffer. createImageFromName is still used to create the containing __DRIimage, and createSubImage can then be used no that __DRIimage to create __DRIimages that correspond to the y, u, and v planes (__DRI_IMAGE_FOR

[Mesa-dev] [PATCH v2 2/8] intel: Add support for new __DRIimage formats

2012-07-09 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/intel/intel_screen.c | 15 +++ 1 file changed, 15 insertions(+) diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 2b70aa4..9f31e87 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/d

[Mesa-dev] [PATCH v2 3/8] intel: Add offset field to miptree

2012-07-09 Thread Kristian Høgsberg
This lets us specify an offset into the bo where the miptree starts, which will let us set up a texture for a single plane in a planar buffer. Signed-off-by: Kristian Høgsberg --- src/mesa/drivers/dri/i915/i915_texstate.c |2 +- src/mesa/drivers/dri/i965/brw_wm_surface_state.c |

[Mesa-dev] [PATCH v2 4/8] intel: Implement __DRIimage::createSubImage and bump supported version to 5

2012-07-09 Thread Kristian Høgsberg
We use the new miptree offset to pick out the sub-image when we bind the EGLImage to a texture. Signed-off-by: Kristian Høgsberg --- src/mesa/drivers/dri/intel/intel_regions.h |1 + src/mesa/drivers/dri/intel/intel_screen.c| 50 -- src/mesa/drivers/dri/intel/i

[Mesa-dev] [PATCH v2 5/8] wayland-drm: Pass struct wl_drm_buffer to the driver

2012-07-09 Thread Kristian Høgsberg
We're going to extend this to support multi-plane buffers, so pass this to the driver so it can access the details. --- src/egl/drivers/dri2/egl_dri2.c| 33 +--- src/egl/wayland/wayland-drm/wayland-drm.c | 19 +++ src/egl/wayland/wayland-drm

[Mesa-dev] [PATCH v2 6/8] wayland-drm: Add protocol to create planar buffers

2012-07-09 Thread Kristian Høgsberg
--- src/egl/drivers/dri2/egl_dri2.c| 11 ++- .../wayland/wayland-drm/protocol/wayland-drm.xml | 16 src/egl/wayland/wayland-drm/wayland-drm.c | 79 +++- src/egl/wayland/wayland-drm/wayland-drm.h |5 +- .../egl/common/native_way

[Mesa-dev] [PATCH v2 7/8] egl: Add EGL_WAYLAND_PLANE_WL attribute

2012-07-09 Thread Kristian Høgsberg
This lets us specify the plane to create the image for for multiplanar wl_buffers. Signed-off-by: Kristian Høgsberg --- docs/WL_bind_wayland_display.spec | 19 +- include/EGL/eglmesaext.h |1 + src/egl/drivers/dri2/egl_dri2.c | 117 +++-- src

[Mesa-dev] [PATCH v2 8/8] egl_dri2: Set content type for wl_buffer

2012-07-09 Thread Kristian Høgsberg
This lets the compositor know about the structure of the wl_buffer, namely which planes and components are available and in which order. --- src/egl/drivers/dri2/egl_dri2.c |5 + 1 file changed, 5 insertions(+) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c

Re: [Mesa-dev] [PATCH 3/8] i965/msaa: Allocate MCS buffer when CMS MSAA is in use.

2012-07-09 Thread Chad Versace
On 07/09/2012 02:00 PM, Paul Berry wrote: > > > On 9 July 2012 13:36, Chad Versace > wrote: > > On 07/06/2012 03:29 PM, Paul Berry wrote: > > To implement Gen7's CMS MSAA layout, we need an extra buffer, the MCS > > (Multisample Control Surface)

Re: [Mesa-dev] [PATCH 1/9] automake: convert libOSmesa building

2012-07-09 Thread nobled
On Mon, Jul 9, 2012 at 11:41 AM, Jon TURNEY wrote: > From: Laurent Carlier > > This also currently fix the installation of libOSmesa. > > v2: Remove old Makefile, libOSmesa is now versioned, fix typos > v3: Keep config substitution alphabetized > v4: Update .gitignore > > Reviewed-by: Jon TURNEY

Re: [Mesa-dev] [PATCH 1/8] __DRIimage: version 5, add new formats and createSubImage

2012-07-09 Thread nobled
On Sat, Jul 7, 2012 at 1:40 AM, Kristian Høgsberg wrote: > On Fri, Jul 06, 2012 at 02:10:57PM -0700, Eric Anholt wrote: >> Kristian Høgsberg writes: >> >> > The additions in version 5 enables creating EGLImages for different planes >> > of a YUV buffer. createImageFromName is still used to creat

[Mesa-dev] [PATCH 3/5] i965/fs: Replace usage of is_tex() with regs_written() checks.

2012-07-09 Thread Eric Anholt
In these places, we care about any sort of send that hits more than one reg, not just textures. We don't yet have anything else returning more than one reg, so there's no change. --- src/mesa/drivers/dri/i965/brw_fs.cpp | 16 1 file changed, 8 insertions(+), 8 deletions(-) dif

[Mesa-dev] [PATCH 1/5] i965/fs: Move a block out of a loop in live variables setup.

2012-07-09 Thread Eric Anholt
This was accidentally copy-and-pasted inside. --- src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp b/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp index 464

[Mesa-dev] [PATCH 5/5] i965/fs: Make register spill/unspill only do the regs for that instruction.

2012-07-09 Thread Eric Anholt
Previously, if we were spilling the result of a texture call, we would store all 4 regs, then for each use of one of those regs as the source of an instruction, we would unspill all 4 regs even though only one was needed. In an app we're looking at, one shader goes from 2817 instructions to 2179,

[Mesa-dev] [PATCH 4/5] i965/fs.h: Refactor tests for instructions modifying a register.

2012-07-09 Thread Eric Anholt
--- src/mesa/drivers/dri/i965/brw_fs.cpp | 25 ++-- src/mesa/drivers/dri/i965/brw_fs.h |1 + .../drivers/dri/i965/brw_fs_copy_propagation.cpp | 16 ++--- src/mesa/drivers/dri/i965/brw_fs_cse.cpp |8 +-- 4 files chang

[Mesa-dev] [PATCH 2/5] i965/fs: Rename virtual_grf_next to virtual_grf_count.

2012-07-09 Thread Eric Anholt
"count" is a more useful name, since most of the time we're using it for looping over the variables. --- src/mesa/drivers/dri/i965/brw_fs.cpp |9 src/mesa/drivers/dri/i965/brw_fs.h |2 +- .../drivers/dri/i965/brw_fs_live_variables.cpp |4 ++--

Re: [Mesa-dev] [PATCH] r600g: improve flushed depth texture handling v2

2012-07-09 Thread Vadim Girlin
On Sat, 2012-07-07 at 01:48 +0200, Marek Olšák wrote: > On Wed, Jun 27, 2012 at 1:34 AM, Vadim Girlin wrote: > > Use r600_resource_texture::flished_depth_texture for GPU access, and > > allocate it in the VRAM. For transfers we'll allocate untiled texture in the > > GTT and store it in the r600_tr

Re: [Mesa-dev] [PATCH 3/5] i965/fs: Replace usage of is_tex() with regs_written() checks.

2012-07-09 Thread Kenneth Graunke
On 07/09/2012 03:40 PM, Eric Anholt wrote: [snip] > @@ -1729,10 +1731,8 @@ fs_visitor::compute_to_mrf() >* into a compute-to-MRF. >*/ > > +/* SENDs can only write to GRFs, so no compute-to-MRF. */ > if (scan_inst->is_tex()) { > -/* texturi