date:20131107

Ever since this had appeared as part of GL4.4 I'd been curious
about whether this extension was going to Just Work, or be a
workaround-party like ARB_vertex_type_2_10_10_10_rev.

Today my curiousity got the better of me, and it turns out it
just works.

Tested and enabled on Gen6+ -- theoretically could work on earlier
gens as well, but the spec requires 3.0 so little point.

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 2/7] mesa: add varray support for UNSIGNED_INT_10F_11F_11F_REV type

Signed-off-by: Chris Forbes 
---
 src/mesa/main/varray.c | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index dee476a..5af4c8c 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -60,6 +60,7 @@
 #define FIXED_GL_BIT 0x800
 #define UNSIGNED_INT_2_10_10_10_REV_BIT 0x1000
 #define INT_2_10_10_10_REV_BIT 0x2000
+#define UNSIGNED_INT_10F_11F_11F_REV_BIT 0x4000
 
 
 /** Convert GL datatype enum into a _BIT value seen above */
@@ -96,6 +97,8 @@ type_to_bit(const struct gl_context *ctx, GLenum type)
   return UNSIGNED_INT_2_10_10_10_REV_BIT;
case GL_INT_2_10_10_10_REV:
   return INT_2_10_10_10_REV_BIT;
+   case GL_UNSIGNED_INT_10F_11F_11F_REV:
+  return UNSIGNED_INT_10F_11F_11F_REV_BIT;
default:
   return 0;
}
@@ -150,7 +153,7 @@ update_array(struct gl_context *ctx,
}
 
if (_mesa_is_gles(ctx)) {
-  legalTypesMask &= ~(FIXED_GL_BIT | DOUBLE_BIT);
+  legalTypesMask &= ~(FIXED_GL_BIT | DOUBLE_BIT | 
UNSIGNED_INT_10F_11F_11F_REV_BIT);
 
   /* GL_INT and GL_UNSIGNED_INT data is not allowed in OpenGL ES until
* 3.0.  The 2_10_10_10 types are added in OpenGL ES 3.0 or
@@ -180,6 +183,9 @@ update_array(struct gl_context *ctx,
   if (!ctx->Extensions.ARB_vertex_type_2_10_10_10_rev)
  legalTypesMask &= ~(UNSIGNED_INT_2_10_10_10_REV_BIT |
  INT_2_10_10_10_REV_BIT);
+
+  if (!ctx->Extensions.ARB_vertex_type_10f_11f_11f_rev)
+ legalTypesMask &= ~UNSIGNED_INT_10F_11F_11F_REV_BIT;
}
 
typeBit = type_to_bit(ctx, type);
@@ -243,6 +249,12 @@ update_array(struct gl_context *ctx,
   return;
}
 
+   if (ctx->Extensions.ARB_vertex_type_10f_11f_11f_rev &&
+ type == GL_UNSIGNED_INT_10F_11F_11F_REV && size != 3) {
+  _mesa_error(ctx, GL_INVALID_OPERATION, "%s(size=%d)", func, size);
+  return;
+   }
+
ASSERT(size <= 4);
 
if (stride < 0) {
@@ -473,7 +485,8 @@ _mesa_VertexAttribPointer(GLuint index, GLint size, GLenum 
type,
   HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
   FIXED_ES_BIT | FIXED_GL_BIT |
   UNSIGNED_INT_2_10_10_10_REV_BIT |
-  INT_2_10_10_10_REV_BIT);
+  INT_2_10_10_10_REV_BIT |
+  UNSIGNED_INT_10F_11F_11F_REV_BIT);
GET_CURRENT_CONTEXT(ctx);
 
if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-- 
1.8.4.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 1/7] mesa: Add extension scaffolding for ARB_vertex_type_10f_11f_11f_rev

Signed-off-by: Chris Forbes 
---
 src/mesa/main/extensions.c | 1 +
 src/mesa/main/mtypes.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 48c4e9f..3da1c42 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -168,6 +168,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_vertex_buffer_object",o(dummy_true),  
GLL,2003 },
{ "GL_ARB_vertex_program",  o(ARB_vertex_program),  
GLL,2002 },
{ "GL_ARB_vertex_shader",   o(ARB_vertex_shader),   
GL, 2002 },
+   { "GL_ARB_vertex_type_10f_11f_11f_rev", 
o(ARB_vertex_type_10f_11f_11f_rev), GL, 2013 },
{ "GL_ARB_vertex_type_2_10_10_10_rev",  
o(ARB_vertex_type_2_10_10_10_rev),  GL, 2009 },
{ "GL_ARB_window_pos",  o(dummy_true),  
GLL,2001 },
/* EXT extensions */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b5c5583..c6322c9 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3291,6 +3291,7 @@ struct gl_extensions
GLboolean ARB_uniform_buffer_object;
GLboolean ARB_vertex_program;
GLboolean ARB_vertex_shader;
+   GLboolean ARB_vertex_type_10f_11f_11f_rev;
GLboolean ARB_vertex_type_2_10_10_10_rev;
GLboolean EXT_blend_color;
GLboolean EXT_blend_equation_separate;
-- 
1.8.4.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 3/7] mesa: Add support to _mesa_bytes_per_vertex_attrib for 10_11_11 format.

Signed-off-by: Chris Forbes 
---
 src/mesa/main/glformats.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index dfee6f1..740faa8 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -345,6 +345,11 @@ _mesa_bytes_per_vertex_attrib(GLint comps, GLenum type)
  return sizeof(GLuint);
   else
  return -1;
+   case GL_UNSIGNED_INT_10F_11F_11F_REV:
+  if (comps == 3)
+ return sizeof(GLuint);
+  else
+ return -1;
default:
   return -1;
}
-- 
1.8.4.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 6/7] i965: Enable ARB_vertex_type_10f_11f_11f_rev on Gen6+.

This theoretically works on earlier hardware as well, but the extension
requires at least GL3.0.

Signed-off-by: Chris Forbes 
---
 src/mesa/drivers/dri/i965/intel_extensions.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c 
b/src/mesa/drivers/dri/i965/intel_extensions.c
index 5eae84f..fbda424 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -210,6 +210,7 @@ intelInitExtensions(struct gl_context *ctx)
   ctx->Extensions.ARB_shading_language_packing = true;
   ctx->Extensions.ARB_texture_multisample = true;
   ctx->Extensions.ARB_sample_shading = true;
+  ctx->Extensions.ARB_vertex_type_10f_11f_11f_rev = true;
 
   /* Test if the kernel has the ioctl. */
   if (drm_intel_reg_read(brw->bufmgr, TIMESTAMP, &dummy) == 0)
-- 
1.8.4.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 7/7] docs: Mark off ARB_vertex_type_10f_11f_11f_rev.

Signed-off-by: Chris Forbes 
---
 docs/GL3.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/GL3.txt b/docs/GL3.txt
index 7d100df..93bd09e 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -175,7 +175,7 @@ GL_ARB_multi_bindnot 
started
 GL_ARB_query_buffer_object   not started
 GL_ARB_texture_mirror_clamp_to_edge  DONE (i965, nv30, nv50, 
nvc0, r300, r600, radeonsi, swrast)
 GL_ARB_texture_stencil8  not started
-GL_ARB_vertex_type_10f_11f_11f_rev   not started
+GL_ARB_vertex_type_10f_11f_11f_rev   DONE (i965)
 
 
 More info about these features and the work involved can be found at
-- 
1.8.4.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 4/7] vbo: add 10_11_11 support to vbo_attrib_tmp

Signed-off-by: Chris Forbes 
---
 src/mesa/vbo/vbo_attrib_tmp.h | 32 ++--
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index bbc0205..358d12d 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -25,6 +25,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **/
 
+#include "util/u_format_r11g11b10f.h"
+
 /* float */
 #define ATTR1FV( A, V ) ATTR( A, 1, GL_FLOAT, (V)[0], 0, 0, 1 )
 #define ATTR2FV( A, V ) ATTR( A, 2, GL_FLOAT, (V)[0], (V)[1], 0, 1 )
@@ -205,6 +207,10 @@ static inline float conv_i2_to_norm_float(const struct 
gl_context *ctx, int i2)
   } else { \
 ATTRI10_##val((attr), (arg));  \
   }\
+   } else if ((type) == GL_UNSIGNED_INT_10F_11F_11F_REV) { \
+  float res[4];\
+  r11g11b10f_to_float3((arg), res);\
+  ATTR##val##FV((attr), res);  \
} else  \
   ERROR(GL_INVALID_VALUE); \
} while(0)
@@ -835,12 +841,26 @@ TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
   ATTR4FV(index, v);
 }
 
+
 #define ERROR_IF_NOT_PACKED_TYPE(ctx, type, func) \
if (type != GL_INT_2_10_10_10_REV && type != 
GL_UNSIGNED_INT_2_10_10_10_REV) { \
   _mesa_error(ctx, GL_INVALID_ENUM, "%s(type)", func); \
   return; \
}
 
+/* Extended version of ERROR_IF_NOT_PACKED_TYPE which also
+ * accepts GL_UNSIGNED_INT_10F_11F_11F_REV.
+ *
+ * Only used for VertexAttribP[123]ui[v]; VertexAttribP4* cannot use this type,
+ * and neither can legacy vertex attribs.
+ */
+#define ERROR_IF_NOT_PACKED_TYPE_EXT(ctx, type, func) \
+   if (type != GL_INT_2_10_10_10_REV && type != GL_UNSIGNED_INT_2_10_10_10_REV 
&& \
+   type != GL_UNSIGNED_INT_10F_11F_11F_REV) { \
+  _mesa_error(ctx, GL_INVALID_ENUM, "%s(type)", func); \
+  return; \
+   }
+
 static void GLAPIENTRY
 TAG(VertexP2ui)(GLenum type, GLuint value)
 {
@@ -1094,7 +1114,7 @@ TAG(VertexAttribP1ui)(GLuint index, GLenum type, 
GLboolean normalized,
  GLuint value)
 {
GET_CURRENT_CONTEXT(ctx);
-   ERROR_IF_NOT_PACKED_TYPE(ctx, type, "glVertexAttribP1ui");
+   ERROR_IF_NOT_PACKED_TYPE_EXT(ctx, type, "glVertexAttribP1ui");
ATTR_UI_INDEX(ctx, 1, type, normalized, index, value);
 }
 
@@ -1103,7 +1123,7 @@ TAG(VertexAttribP2ui)(GLuint index, GLenum type, 
GLboolean normalized,
  GLuint value)
 {
GET_CURRENT_CONTEXT(ctx);
-   ERROR_IF_NOT_PACKED_TYPE(ctx, type, "glVertexAttribP2ui");
+   ERROR_IF_NOT_PACKED_TYPE_EXT(ctx, type, "glVertexAttribP2ui");
ATTR_UI_INDEX(ctx, 2, type, normalized, index, value);
 }
 
@@ -1112,7 +1132,7 @@ TAG(VertexAttribP3ui)(GLuint index, GLenum type, 
GLboolean normalized,
  GLuint value)
 {
GET_CURRENT_CONTEXT(ctx);
-   ERROR_IF_NOT_PACKED_TYPE(ctx, type, "glVertexAttribP3ui");
+   ERROR_IF_NOT_PACKED_TYPE_EXT(ctx, type, "glVertexAttribP3ui");
ATTR_UI_INDEX(ctx, 3, type, normalized, index, value);
 }
 
@@ -1130,7 +1150,7 @@ TAG(VertexAttribP1uiv)(GLuint index, GLenum type, 
GLboolean normalized,
   const GLuint *value)
 {
GET_CURRENT_CONTEXT(ctx);
-   ERROR_IF_NOT_PACKED_TYPE(ctx, type, "glVertexAttribP1uiv");
+   ERROR_IF_NOT_PACKED_TYPE_EXT(ctx, type, "glVertexAttribP1uiv");
ATTR_UI_INDEX(ctx, 1, type, normalized, index, *value);
 }
 
@@ -1139,7 +1159,7 @@ TAG(VertexAttribP2uiv)(GLuint index, GLenum type, 
GLboolean normalized,
   const GLuint *value)
 {
GET_CURRENT_CONTEXT(ctx);
-   ERROR_IF_NOT_PACKED_TYPE(ctx, type, "glVertexAttribP2uiv");
+   ERROR_IF_NOT_PACKED_TYPE_EXT(ctx, type, "glVertexAttribP2uiv");
ATTR_UI_INDEX(ctx, 2, type, normalized, index, *value);
 }
 
@@ -1148,7 +1168,7 @@ TAG(VertexAttribP3uiv)(GLuint index, GLenum type, 
GLboolean normalized,
   const GLuint *value)
 {
GET_CURRENT_CONTEXT(ctx);
-   ERROR_IF_NOT_PACKED_TYPE(ctx, type, "glVertexAttribP3uiv");
+   ERROR_IF_NOT_PACKED_TYPE_EXT(ctx, type, "glVertexAttribP3uiv");
ATTR_UI_INDEX(ctx, 3, type, normalized, index, *value);
 }
 
-- 
1.8.4.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 5/7] i965: add support for UNSIGNED_INT_10F_11F_11F_REV vertex attribs

Signed-off-by: Chris Forbes 
---
 src/mesa/drivers/dri/i965/brw_draw_upload.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c 
b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 4da1b7e..e2002e8 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -244,6 +244,8 @@ brw_get_vertex_surface_type(struct brw_context *brw,
   case GL_UNSIGNED_BYTE: return ubyte_types_direct[size];
   default: assert(0); return 0;
   }
+   } else if (glarray->Type == GL_UNSIGNED_INT_10F_11F_11F_REV) {
+  return BRW_SURFACEFORMAT_R11G11B10_FLOAT;
} else if (glarray->Normalized) {
   switch (glarray->Type) {
   case GL_DOUBLE: return double_types[size];
-- 
1.8.4.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 3/3] st/xorg: Delete.

2013-11-07 Thread Lucas Stach

Am Mittwoch, den 06.11.2013, 21:52 -0800 schrieb Matt Turner:
> ---
> Deleted files diff removed.
> 
I think there was some nice stuff in here that didn't make it into XA,
but that's no valid reason to keep st/xorg alive in the tree.

If someone is interested in porting things to XA, it's just some git
history digging.

So,
Acked-by: Lucas Stach 

>  configure.ac |   56 +-
>  src/gallium/SConscript   |3 -
>  src/gallium/state_trackers/Makefile.am   |4 -
>  src/gallium/state_trackers/xorg/Makefile.am  |   43 -
>  src/gallium/state_trackers/xorg/Makefile.sources |   11 -
>  src/gallium/state_trackers/xorg/SConscript   |   29 -
>  src/gallium/state_trackers/xorg/compat-api.h |   99 --
>  src/gallium/state_trackers/xorg/xorg_composite.c |  585 --
>  src/gallium/state_trackers/xorg/xorg_composite.h |   36 -
>  src/gallium/state_trackers/xorg/xorg_crtc.c  |  448 
>  src/gallium/state_trackers/xorg/xorg_dri2.c  |  473 
>  src/gallium/state_trackers/xorg/xorg_driver.c| 1323 
> --
>  src/gallium/state_trackers/xorg/xorg_exa.c   | 1087 --
>  src/gallium/state_trackers/xorg/xorg_exa.h   |   76 --
>  src/gallium/state_trackers/xorg/xorg_exa_tgsi.c  |  690 ---
>  src/gallium/state_trackers/xorg/xorg_exa_tgsi.h  |   59 -
>  src/gallium/state_trackers/xorg/xorg_output.c|  331 --
>  src/gallium/state_trackers/xorg/xorg_renderer.c  |  547 -
>  src/gallium/state_trackers/xorg/xorg_renderer.h  |   81 --
>  src/gallium/state_trackers/xorg/xorg_tracker.h   |  236 
>  src/gallium/state_trackers/xorg/xorg_winsys.h|   50 -
>  src/gallium/state_trackers/xorg/xorg_xv.c|  750 
>  src/gallium/state_trackers/xorg/xorg_xvmc.c  |  119 --
>  23 files changed, 11 insertions(+), 7125 deletions(-)
>  delete mode 100644 src/gallium/state_trackers/xorg/Makefile.am
>  delete mode 100644 src/gallium/state_trackers/xorg/Makefile.sources
>  delete mode 100644 src/gallium/state_trackers/xorg/SConscript
>  delete mode 100644 src/gallium/state_trackers/xorg/compat-api.h
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_composite.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_composite.h
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_crtc.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_dri2.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_driver.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_exa.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_exa.h
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_exa_tgsi.h
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_output.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_renderer.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_renderer.h
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_tracker.h
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_winsys.h
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_xv.c
>  delete mode 100644 src/gallium/state_trackers/xorg/xorg_xvmc.c
> 
> diff --git a/configure.ac b/configure.ac
> index 6caa125..28faf24 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -35,8 +35,6 @@ LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41"
>  LIBDRM_FREEDRENO_REQUIRED=2.4.39
>  DRI2PROTO_REQUIRED=2.6
>  GLPROTO_REQUIRED=1.4.14
> -LIBDRM_XORG_REQUIRED=2.4.24
> -LIBKMS_XORG_REQUIRED=1.0.0
>  
>  dnl Check for progs
>  AC_PROG_CPP
> @@ -556,11 +554,6 @@ AC_ARG_ENABLE([egl],
>  [enable_egl="$enableval"],
>  [enable_egl=yes])
>  
> -AC_ARG_ENABLE([xorg],
> -[AS_HELP_STRING([--enable-xorg],
> -[enable support for X.Org DDX API @<:@default=no@:>@])],
> -[enable_xorg="$enableval"],
> -[enable_xorg=no])
>  AC_ARG_ENABLE([xa],
>  [AS_HELP_STRING([--enable-xa],
>  [enable build of the XA X Acceleration API @<:@default=no@:>@])],
> @@ -651,7 +644,6 @@ if test "x$enable_opengl" = xno -a \
>  "x$enable_gles1" = xno -a \
>  "x$enable_gles2" = xno -a \
>  "x$enable_openvg" = xno -a \
> -"x$enable_xorg" = xno -a \
>  "x$enable_xa" = xno -a \
>  "x$enable_xvmc" = xno -a \
>  "x$enable_vdpau" = xno -a \
> @@ -1236,20 +1228,6 @@ fi
>  AM_CONDITIONAL(HAVE_GALLIUM_GBM, test "x$enable_gallium_gbm" = xyes)
>  
>  dnl
> -dnl X.Org DDX configuration
> -dnl
> -if test "x$enable_xorg" = xyes; then
> -PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])
> -PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])
> -PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])
> -PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
> -HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
> -HAVE_XEXTPROTO_71="no")
> -GALLIUM_S

[Mesa-dev] [Bug 67672] 9.2 git, Test failure in src/gallium/drivers/llvmpipe

2013-11-07 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=67672

--- Comment #17 from Roland Scheidegger  ---
(In reply to comment #15)
> I can reproduce the problem on my machine.
> 
> I'm using the tarball at
> ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2 ,
> where version is 9.2.2, with some distribution-specific patches and
> configuration options (NixOS x-updates branch).  If you think these might be
> interfering, let me know and I'll see if I can build without the changes.
> 
> 
> Here's my output for GALLIUM_DUMP_CPU=1 ./lp_test_arit (with LD_LIBRARY_PATH
> set for annoying reasons):
> 
> $
> LD_LIBRARY_PATH=/tmp/nix-build-mesa-noglu-9.2.2.drv-0/Mesa-9.2.2/src/gallium/
> auxiliary/gallivm/.libs/lp_bld_init.o GALLIUM_DUMP_CPU=1
> ./lp_test_arit
> util_cpu_caps.nr_cpus = 3
> util_cpu_caps.x86_cpu_type = 9
> util_cpu_caps.cacheline = 64
> util_cpu_caps.has_tsc = 1
> util_cpu_caps.has_mmx = 1
> util_cpu_caps.has_mmx2 = 1
> util_cpu_caps.has_sse = 1
> util_cpu_caps.has_sse2 = 1
> util_cpu_caps.has_sse3 = 1
> util_cpu_caps.has_ssse3 = 0
> util_cpu_caps.has_sse4_1 = 0
> util_cpu_caps.has_sse4_2 = 0
> util_cpu_caps.has_avx = 0
> util_cpu_caps.has_3dnow = 1
> util_cpu_caps.has_3dnow_ext = 1
> util_cpu_caps.has_altivec = 0

> processor : 0
> vendor_id : GenuineIntel
> cpu family: 6
> model : 58
> model name: Intel(R) Core(TM) i7-3520M CPU @ 2.90GHz
> stepping  : 9
> microcode : 0x12
> cpu MHz   : 1200.000
> cache size: 4096 KB
> physical id   : 0
> siblings  : 4
> core id   : 0
> cpu cores : 2
> apicid: 0
> initial apicid: 0
> fpu   : yes
> fpu_exception : yes
> cpuid level   : 13
> wp: yes
> flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov 
> pat
> pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm
> constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc
> aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16
> xtpr pdcm pcid sse4_1 sse4_2 x2apic popcnt tsc_deadline_timer aes xsave avx
> f16c rdrand lahf_lm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi
> flexpriority ept vpid fsgsbase smep erms

Hmm the util_cpu_caps are totally busted, I wonder what's up with that...

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] DEFAULT_SOFTWARE_DEPTH_BITS=31


On 11/06/2013 04:59 PM, burlen wrote:

On 11/06/2013 12:58 PM, Brian Paul wrote:

On 11/06/2013 12:34 PM, burlen wrote:

When I build osmesa with --with-osmesa-bits=32 I notice that I get 31
bits by way of the compile line define -DDEFAULT_SOFTWARE_DEPTH_BITS=31.
What's the story with the number 31? Is 31 bits really better than 32?


IIRC, 32 bit Z never worked properly because of float->int conversion
problems and such.  I think I found that 31 bits worked though.  It's
been a long time...



I'm using OSMesa with VTK for rendering on systems that do not have
graphics hardware. I need higher than default depth buffer with OSMesa
to prevent z-buffer fighting artifacts in some cases when rendering in
parallel. I found that --with-osmesa-bits=32 does the trick. however
when building osmesa with 32 bits, most line rendering fails. Here is a
representative image diff from our regression suite that shows an
example of the bug
http://open.cdash.org/testDetails.php?test=216532438&build=3087854

, there are 80 other failed tests, the ones I examined were all the same.

Experimenting with --with-osmesa-bits options, I've found that using 32
causes the issue, while using 8 , 16 or not using it all doesn't. Do you
have any idea about this?


I set DEFAULT_SOFTWARE_DEPTH_BITS=32 and tried a few demo programs and 
they look OK so far.


Could you possibly create an apitrace of one of the failing cases?

-Brian

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH V2 04/15] mesa: Add binding point for indirect buffer


On 11/07/2013 12:06 AM, Chris Forbes wrote:

Based on part of Patch 2 of Christoph Bumiller's ARB_draw_indirect series.

Signed-off-by: Chris Forbes 
---
  src/mesa/main/bufferobj.c| 14 ++
  src/mesa/main/get.c  |  4 
  src/mesa/main/get_hash_params.py |  2 ++
  src/mesa/main/mtypes.h   |  2 ++
  4 files changed, 22 insertions(+)

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 1f55061..a75802e 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -86,6 +86,12 @@ get_buffer_target(struct gl_context *ctx, GLenum target)
return &ctx->CopyReadBuffer;
 case GL_COPY_WRITE_BUFFER:
return &ctx->CopyWriteBuffer;
+   case GL_DRAW_INDIRECT_BUFFER:
+  if (ctx->API == API_OPENGL_CORE &&
+  ctx->Extensions.ARB_draw_indirect) {
+ return &ctx->DrawIndirectBuffer;
+  }
+  break;
 case GL_TRANSFORM_FEEDBACK_BUFFER:
if (ctx->Extensions.EXT_transform_feedback) {
   return &ctx->TransformFeedback.CurrentBuffer;
@@ -626,6 +632,9 @@ _mesa_init_buffer_objects( struct gl_context *ctx )
 _mesa_reference_buffer_object(ctx, &ctx->UniformBuffer,
 ctx->Shared->NullBufferObj);

+   _mesa_reference_buffer_object(ctx, &ctx->DrawIndirectBuffer,
+ctx->Shared->NullBufferObj);
+
 for (i = 0; i < MAX_COMBINED_UNIFORM_BUFFERS; i++) {
_mesa_reference_buffer_object(ctx,
&ctx->UniformBufferBindings[i].BufferObject,
@@ -873,6 +882,11 @@ _mesa_DeleteBuffers(GLsizei n, const GLuint *ids)
  _mesa_BindBuffer( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
   }

+ /* unbind ARB_draw_indirect binding point */
+ if (ctx->DrawIndirectBuffer == bufObj) {
+_mesa_BindBuffer( GL_DRAW_INDIRECT_BUFFER, 0 );
+ }
+
   /* unbind ARB_copy_buffer binding points */
   if (ctx->CopyReadBuffer == bufObj) {
  _mesa_BindBuffer( GL_COPY_READ_BUFFER, 0 );
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index ad53b25..a471383 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -914,6 +914,10 @@ find_custom_value(struct gl_context *ctx, const struct 
value_desc *d, union valu
 case GL_ATOMIC_COUNTER_BUFFER_BINDING:
v->value_int = ctx->AtomicBuffer->Name;
break;
+   /* GL_ARB_draw_indirect */
+   case GL_DRAW_INDIRECT_BUFFER_BINDING:
+  v->value_int = ctx->DrawIndirectBuffer->Name;
+  break;
 }
  }

diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 0851b7b..226ede0 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -743,6 +743,8 @@ descriptor=[
  { "apis": ["GL_CORE"], "params": [
  # GL_ARB_texture_buffer_range
[ "TEXTURE_BUFFER_OFFSET_ALIGNMENT", 
"CONTEXT_INT(Const.TextureBufferOffsetAlignment), extra_ARB_texture_buffer_range" ],
+# GL_ARB_draw_indirect
+  [ "DRAW_INDIRECT_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, 
extra_ARB_draw_indirect" ],


Does this really need a LOC_CUSTOM?  Could we just do:

[ "DRAW_INDIRECT_BUFFER_BINDING", 
"CONTEXT_INT(DrawIndirectBuffer->name), extra_ARB_draw_indirect" ],


and remove the switch case above?




  ]}

  ]
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b474878..4f4fc52 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3813,6 +3813,8 @@ struct gl_context

 struct gl_perf_monitor_state PerfMonitor;

+   struct gl_buffer_object *DrawIndirectBuffer; /** < GL_ARB_draw_indirect */
+
 struct gl_buffer_object *CopyReadBuffer; /**< GL_ARB_copy_buffer */
 struct gl_buffer_object *CopyWriteBuffer; /**< GL_ARB_copy_buffer */




___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH V2 14/15] vbo: map indirect buffer and extract params if doing sw primitive restart


On 11/07/2013 12:06 AM, Chris Forbes wrote:

V2: Check for mapping failure (thanks Brian)

Signed-off-by: Chris Forbes 
---
  src/mesa/vbo/vbo_primitive_restart.c | 33 +
  1 file changed, 33 insertions(+)

diff --git a/src/mesa/vbo/vbo_primitive_restart.c 
b/src/mesa/vbo/vbo_primitive_restart.c
index 48d04e1..ee84f10 100644
--- a/src/mesa/vbo/vbo_primitive_restart.c
+++ b/src/mesa/vbo/vbo_primitive_restart.c
@@ -180,6 +180,39 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
 GLboolean map_ib = ib->obj->Name && !ib->obj->Pointer;
 void *ptr;

+   /* If there is an indirect buffer, map it and extract the draw params */
+   if (indirect && prims[0].is_indirect) {
+  struct _mesa_prim new_prim = *prims;
+  struct _mesa_index_buffer new_ib = *ib;
+  const uint32_t *indirect_params;
+  if (!ctx->Driver.MapBufferRange(ctx, 0, indirect->Size, GL_MAP_READ_BIT,
+(struct gl_buffer_object *)indirect)) {
+
+ /* something went wrong with mapping, give up */
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "failed to map indirect buffer for sw primitive restart");


I suspect we'd only hit this if we ran out of memory earlier and failed 
to allocate the buffer.  So, I'd probably report GL_OUT_OF_MEMORY here. 
 I think we do that in other places where mapping fails too.


The rest of the core Mesa changes look OK to me.  For those:
Reviewed-by: Brian Paul 


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] DEFAULT_SOFTWARE_DEPTH_BITS=31

2013-11-07 Thread burlen


On 11/07/2013 06:42 AM, Brian Paul wrote:

On 11/06/2013 04:59 PM, burlen wrote:

On 11/06/2013 12:58 PM, Brian Paul wrote:

On 11/06/2013 12:34 PM, burlen wrote:

When I build osmesa with --with-osmesa-bits=32 I notice that I get 31
bits by way of the compile line define 
-DDEFAULT_SOFTWARE_DEPTH_BITS=31.

What's the story with the number 31? Is 31 bits really better than 32?


IIRC, 32 bit Z never worked properly because of float->int conversion
problems and such.  I think I found that 31 bits worked though.  It's
been a long time...



I'm using OSMesa with VTK for rendering on systems that do not have
graphics hardware. I need higher than default depth buffer with OSMesa
to prevent z-buffer fighting artifacts in some cases when rendering in
parallel. I found that --with-osmesa-bits=32 does the trick. however
when building osmesa with 32 bits, most line rendering fails. Here is a
representative image diff from our regression suite that shows an
example of the bug
http://open.cdash.org/testDetails.php?test=216532438&build=3087854
 

, there are 80 other failed tests, the ones I examined were all the 
same.


Experimenting with --with-osmesa-bits options, I've found that using 32
causes the issue, while using 8 , 16 or not using it all doesn't. Do you
have any idea about this?


I set DEFAULT_SOFTWARE_DEPTH_BITS=32 and tried a few demo programs and 
they look OK so far.


Could you possibly create an apitrace of one of the failing cases?

did you set DEFAULT_SOFTWARE_DEPTH_BITS=32 or --with-osmesa-bits=32? 
--with-osmesa-bits=16 also sets depth bits to 31, and that case doesn't 
have the problem. so seems that it's something other than the depth bits 
about the --with-osmesa-bits=32 build.


I'll see about the apitrace

Thanks
Burlen

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] DEFAULT_SOFTWARE_DEPTH_BITS=31

On 11/07/2013 09:09 AM, burlen wrote:

On 11/07/2013 06:42 AM, Brian Paul wrote:

On 11/06/2013 04:59 PM, burlen wrote:

On 11/06/2013 12:58 PM, Brian Paul wrote:

On 11/06/2013 12:34 PM, burlen wrote:

When I build osmesa with --with-osmesa-bits=32 I notice that I get 31
bits by way of the compile line define
-DDEFAULT_SOFTWARE_DEPTH_BITS=31.
What's the story with the number 31? Is 31 bits really better than 32?

IIRC, 32 bit Z never worked properly because of float->int conversion
problems and such. I think I found that 31 bits worked though. It's
been a long time...

I'm using OSMesa with VTK for rendering on systems that do not have
graphics hardware. I need higher than default depth buffer with OSMesa
to prevent z-buffer fighting artifacts in some cases when rendering in
parallel. I found that --with-osmesa-bits=32 does the trick. however
when building osmesa with 32 bits, most line rendering fails. Here is a
representative image diff from our regression suite that shows an
example of the bug
https://urldefense.proofpoint.com/v1/url?u=http://open.cdash.org/testDetails.php?test%3D216532438%26build%3D3087854&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=%2BYxiKNKy6tM2b9uufQKWyLEbSfkSZWpC8Kv9gQu9jJs%3D%0A&s=0f54945a95ef4530f46e70322823ee22159a9400fe3fae6b9c4a324a93ee3c00

, there are 80 other failed tests, the ones I examined were all the
same.

Experimenting with --with-osmesa-bits options, I've found that using 32
causes the issue, while using 8 , 16 or not using it all doesn't. Do you
have any idea about this?

I set DEFAULT_SOFTWARE_DEPTH_BITS=32 and tried a few demo programs and
they look OK so far.

Could you possibly create an apitrace of one of the failing cases?

did you set DEFAULT_SOFTWARE_DEPTH_BITS=32 or --with-osmesa-bits=32?
--with-osmesa-bits=16 also sets depth bits to 31, and that case doesn't
have the problem. so seems that it's something other than the depth bits
about the --with-osmesa-bits=32 build.

I did -DDEFAULT_SOFTWARE_DEPTH_BITS=32

I'll see about the apitrace

I'm not actually sure what it'll do with OSMesa. But if you can get
anything and I can make a text dump of the GL calls that'll help.

-Brian

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 2/3] Create untiled buffers in get_back_bo when needed.

We must send to the compositor buffer it is able to read.

Since tiling modes are different on graphic cards, we have
to disable tiling when creating the buffers if we render
with a different graphic card than the compositor.

Signed-off-by: Axel Davy 
---
 src/egl/drivers/dri2/platform_wayland.c | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
index 709df36..b922ff5 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -283,12 +283,17 @@ get_back_bo(struct dri2_egl_surface *dri2_surf, 
__DRIbuffer *buffer)
if (dri2_surf->back == NULL)
   return -1;
if (dri2_surf->back->dri_image == NULL) {
-  dri2_surf->back->dri_image = 
- dri2_dpy->image->createImage(dri2_dpy->dri_screen,
-  dri2_surf->base.Width,
-  dri2_surf->base.Height,
-  __DRI_IMAGE_FORMAT_ARGB,
-  __DRI_IMAGE_USE_SHARE,
+  unsigned int use_flags = __DRI_IMAGE_USE_SHARE;
+
+  if (!dri2_dpy->enable_tiling)
+ use_flags |= __DRI_IMAGE_USE_LINEAR;
+
+   dri2_surf->back->dri_image = 
+  dri2_dpy->image->createImage(dri2_dpy->dri_screen,
+   dri2_surf->base.Width,
+   dri2_surf->base.Height,
+   __DRI_IMAGE_FORMAT_ARGB,
+  use_flags,
   NULL);
   dri2_surf->back->age = 0;
}
-- 
1.8.1.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] Fix FTBFS on GNU/Hurd due to missing PIPE_OS_HURD detection.

2013-11-07 Thread Fabio Pedretti

From: Cyril Brulebois 

Thanks to Pino Toscano.

Patch from Debian package.
---
 src/gallium/auxiliary/os/os_thread.h | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/auxiliary/os/os_thread.h 
b/src/gallium/auxiliary/os/os_thread.h
index e153ab4..4528abb 100644
--- a/src/gallium/auxiliary/os/os_thread.h
+++ b/src/gallium/auxiliary/os/os_thread.h
@@ -41,7 +41,7 @@
 #include "util/u_debug.h" /* for assert */
 
 
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) 
|| defined(PIPE_OS_HURD)
 
 #include  /* POSIX threads headers */
 #include  /* for perror() */
@@ -316,7 +316,7 @@ typedef int64_t pipe_condvar;
  * pipe_barrier
  */
 
-#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || 
defined(PIPE_OS_SOLARIS)) && !defined(PIPE_OS_ANDROID)
+#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || 
defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) && !defined(PIPE_OS_ANDROID)
 
 typedef pthread_barrier_t pipe_barrier;
 
@@ -444,7 +444,7 @@ pipe_semaphore_wait(pipe_semaphore *sema)
  */
 
 typedef struct {
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) 
|| defined(PIPE_OS_HURD)
pthread_key_t key;
 #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
DWORD key;
@@ -459,7 +459,7 @@ typedef struct {
 static INLINE void
 pipe_tsd_init(pipe_tsd *tsd)
 {
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) 
|| defined(PIPE_OS_HURD)
if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
   perror("pthread_key_create(): failed to allocate key for thread specific 
data");
   exit(-1);
@@ -476,7 +476,7 @@ pipe_tsd_get(pipe_tsd *tsd)
if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
   pipe_tsd_init(tsd);
}
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) 
|| defined(PIPE_OS_HURD)
return pthread_getspecific(tsd->key);
 #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
assert(0);
@@ -493,7 +493,7 @@ pipe_tsd_set(pipe_tsd *tsd, void *value)
if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
   pipe_tsd_init(tsd);
}
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) 
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) 
|| defined(PIPE_OS_HURD)
if (pthread_setspecific(tsd->key, value) != 0) {
   perror("pthread_set_specific() failed");
   exit(-1);
-- 
1.8.3.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 0/3] Implement DRI_PRIME support for Wayland

These patches enable using DRI_PRIME to use a different card
than the compositor card (with render-nodes).

At the time of writing, Mesa Wayland egl backend doesn't
support render-nodes, because it uses the dri2 backend, which
require using GEM names (render-nodes aren't allowed to use GEM
names). But I'm confident this week or next week, the __DRIimage
remplacement will be ready, thanks to Keith Packard, Kristian Hosberg
and Christopher James Halse Rogers.
That's why I'm publishing these patches now, so they have the time
to be reviewed.

Initially, I wanted to use driconf too, as a complement of DRI_PRIME,
but driconf doesn't support string parameters yet, so it'll come later.

To choose a specific device, the user has to specify the id_path_tag of
the device he wants to use. We get the id_path_tag with udev. Systemd
didn't fill this field for render-nodes, so it has to be set as an additional
rule. David Herrmann has sent a patch for that for Systemd, but I don't know if
it is already pushed.

The choice to use id_path_tag comes to the fact that the id_path is stable,
and that it describes non-pci graphic devices too (usb devices, etc). 

An alternative to choose the device to use is to set DRI_PRIME to "1",
which means "choose any other card than the one used by the compositor".

If Mesa doesn't find the device asked by the user, it will use the same
card than the Wayland compositor.

The Wayland Prime support implemented with these patches is different
from X Prime support.

A client using an other card than the compositor will allocate buffers
with no-tiling to render to, and share them with the compositor, unlike
on X, where it would render to a tiled buffer, not shared with the other card,
and a copy mechanism will make the main card receive an untiled buffer.

That means that these (Wayland) clients will perform slowly, compared to
if they weren't using Prime.
In fact it is not how the user is supposed to run a game, for example,
on its dedicated card.

Using a shared, untiled-buffer, but avoiding any copy, is better for 
application which wouldn't do much rendering.

An example of such an application is an embedded Wayland compositor.

To use an heavy application, the user is supposed to launch an
embedded Wayland compositor on the dedicated card, and run the game
inside. The compositor will render into the shared, untiled buffer,
and will copy the content of the game buffers.

Note that the game know it is using the same cards than its compositor,
that's why it enables tiling.

I'm planning to write a Weston shell, designed to run embedded fullscreen games,
that would make Weston resize to the game size, and close when it closes.

Pros:
.If you launch a fullscreen Wayland compositor on the dedicated card,
inside a compositor supporting composite bypass, you'll render the whole
desktop on the dedicated card. The integrated card would only display
the buffer generated, without doing any copy.
.More flexibility


Cons: 
.The user has to use a script to launch a game on the dedicated card.

Pros over X dri2 Prime support:
.Vsync works, whatever the cards used by the client 
.You can understand easily how prime support works


As a last note, this Prime support suffers too from the
lack of dma-buf fences (glitches when the client is still writing
on the buffer when the compositor's card reads it).
Using an embedded compositor suppress all the glitches when
it doesn't take (1/refresh_rate) seconds for it to render a frame,
that is when you don't have an input lag.



Axel Davy (3):
  Move the code to open the graphic device. Support for
render-nodes.
  Create untiled buffers in get_back_bo when needed.
  Implement choosing the device to use with DRI_PRIME

 src/egl/drivers/dri2/egl_dri2.h |   1 +
 src/egl/drivers/dri2/platform_wayland.c | 262 +++-
 2 files changed, 226 insertions(+), 37 deletions(-)

-- 
1.8.1.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 1/3] Move the code to open the graphic device. Support for render-nodes.

This patch moves the code to open the graphic device in the Wayland backend,
removes the authentication request when we are on a render-node,
and has a few fixes.

Signed-off-by: Axel Davy 
---
 src/egl/drivers/dri2/egl_dri2.h |  1 +
 src/egl/drivers/dri2/platform_wayland.c | 93 ++---
 2 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index c7d6484..350a626 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -133,6 +133,7 @@ struct dri2_egl_display
int  authenticated;
int  formats;
uint32_t  capabilities;
+   int  enable_tiling;
 #endif
 
int (*authenticate) (_EGLDisplay *disp, uint32_t id);
diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
index c0de16b..709df36 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -622,8 +622,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisplay *disp)
_eglCleanupDisplay(disp);
 
dri2_dpy->core->destroyScreen(dri2_dpy->dri_screen);
-   close(dri2_dpy->fd);
dlclose(dri2_dpy->driver);
+   close(dri2_dpy->fd);
free(dri2_dpy->driver_name);
free(dri2_dpy->device_name);
wl_drm_destroy(dri2_dpy->wl_drm);
@@ -635,34 +635,28 @@ dri2_terminate(_EGLDriver *drv, _EGLDisplay *disp)
return EGL_TRUE;
 }
 
+static char
+is_fd_render_node(int fd)
+{
+  struct stat render;
+
+  if (fstat(fd, &render))
+return 0;
+
+  if (!S_ISCHR(render.st_mode))
+return 0;
+
+  if (render.st_rdev & 0x80)
+return 1;
+  return 0;
+}
+
 static void
 drm_handle_device(void *data, struct wl_drm *drm, const char *device)
 {
struct dri2_egl_display *dri2_dpy = data;
-   drm_magic_t magic;
 
dri2_dpy->device_name = strdup(device);
-   if (!dri2_dpy->device_name)
-  return;
-
-#ifdef O_CLOEXEC
-   dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR | O_CLOEXEC);
-   if (dri2_dpy->fd == -1 && errno == EINVAL)
-#endif
-   {
-  dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR);
-  if (dri2_dpy->fd != -1)
- fcntl(dri2_dpy->fd, F_SETFD, fcntl(dri2_dpy->fd, F_GETFD) |
-FD_CLOEXEC);
-   }
-   if (dri2_dpy->fd == -1) {
-  _eglLog(_EGL_WARNING, "wayland-egl: could not open %s (%s)",
- dri2_dpy->device_name, strerror(errno));
-  return;
-   }
-
-   drmGetMagic(dri2_dpy->fd, &magic);
-   wl_drm_authenticate(dri2_dpy->wl_drm, magic);
 }
 
 static void
@@ -738,7 +732,8 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
struct dri2_egl_display *dri2_dpy;
const __DRIconfig *config;
uint32_t types;
-   int i;
+   int i, is_render_node;
+   drm_magic_t magic;
static const unsigned int argb_masks[4] =
   { 0xff, 0xff00, 0xff, 0xff00 };
static const unsigned int rgb_masks[4] = { 0xff, 0xff00, 0xff, 0 };
@@ -778,9 +773,39 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
if (roundtrip(dri2_dpy) < 0 || dri2_dpy->wl_drm == NULL)
   goto cleanup_dpy;
 
-   if (roundtrip(dri2_dpy) < 0 || dri2_dpy->fd == -1)
+   if (roundtrip(dri2_dpy) < 0 || dri2_dpy->device_name == NULL)
   goto cleanup_drm;
 
+#ifdef O_CLOEXEC
+   dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR | O_CLOEXEC);
+   if (dri2_dpy->fd == -1 && errno == EINVAL)
+#endif
+   {
+  dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR);
+  if (dri2_dpy->fd != -1)
+ fcntl(dri2_dpy->fd, F_SETFD, fcntl(dri2_dpy->fd, F_GETFD) |
+FD_CLOEXEC);
+   }
+   if (dri2_dpy->fd == -1) {
+  _eglLog(_EGL_WARNING, "wayland-egl: could not open %s (%s)",
+ dri2_dpy->device_name, strerror(errno));
+  goto cleanup_drm;
+   }
+
+   if (is_fd_render_node(dri2_dpy->fd))
+   {
+ _eglLog(_EGL_DEBUG, "wayland-egl: card is render-node");
+  dri2_dpy->authenticated = 1;
+  is_render_node = 1;
+   }
+   else
+   {
+  drmGetMagic(dri2_dpy->fd, &magic);
+  wl_drm_authenticate(dri2_dpy->wl_drm, magic);
+  is_render_node = 0;
+   }
+   dri2_dpy->enable_tiling = 1;
+
if (roundtrip(dri2_dpy) < 0 || !dri2_dpy->authenticated)
   goto cleanup_fd;
 
@@ -799,7 +824,7 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
dri2_dpy->dri2_loader_extension.flushFrontBuffer = dri2_flush_front_buffer;
dri2_dpy->dri2_loader_extension.getBuffersWithFormat =
   dri2_get_buffers_with_format;
-  
+
dri2_dpy->extensions[0] = &dri2_dpy->dri2_loader_extension.base;
dri2_dpy->extensions[1] = &image_lookup_extension.base;
dri2_dpy->extensions[2] = &use_invalidate.base;
@@ -808,14 +833,16 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay 
*disp)
if (!dri2_create_screen(disp))
   goto cleanup_driver;
 
-   /* The server shouldn't advertise WL_DRM_CAPABILITY_PRIME if the driver
-* doesn't have createImageFromFds,

[Mesa-dev] [PATCH 3/3] Implement choosing the device to use with DRI_PRIME