Mesa (master): i965: Use intel_bufferobj_buffer() wrapper in image surface state setup.

2018-05-23 Thread Francisco Jerez
Module: Mesa
Branch: master
Commit: 936cd3c87a212c28fe89a5c059fc4febd8b52ab7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=936cd3c87a212c28fe89a5c059fc4febd8b52ab7

Author: Francisco Jerez 
Date:   Fri Mar 16 14:28:59 2018 -0700

i965: Use intel_bufferobj_buffer() wrapper in image surface state setup.

Instead of directly using intel_obj->buffer.  Among other things
intel_bufferobj_buffer() will update intel_buffer_object::
gpu_active_start/end, which are used by glBufferSubData() to decide
which path to take.  Fixes a failure in the Piglit
ARB_shader_image_load_store-host-mem-barrier Buffer Update/WaW tests,
which could be reproduced with a non-standard glGetTexSubImage
implementation (see bug report).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105351
Reported-by: Nanley Chery 
Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Nanley Chery 

---

 src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c 
b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 39e898243d..73cae9ef7c 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -1520,14 +1520,16 @@ update_image_surface(struct brw_context *brw,
   const unsigned format = get_image_format(brw, u->_ActualFormat, access);
 
   if (obj->Target == GL_TEXTURE_BUFFER) {
- struct intel_buffer_object *intel_obj =
-intel_buffer_object(obj->BufferObject);
  const unsigned texel_size = (format == ISL_FORMAT_RAW ? 1 :
   
_mesa_get_format_bytes(u->_ActualFormat));
  const unsigned buffer_size = buffer_texture_range_size(brw, obj);
+ struct brw_bo *const bo = !obj->BufferObject ? NULL :
+intel_bufferobj_buffer(brw, intel_buffer_object(obj->BufferObject),
+   obj->BufferOffset, buffer_size,
+   access != GL_READ_ONLY);
 
  brw_emit_buffer_surface_state(
-brw, surf_offset, intel_obj->buffer, obj->BufferOffset,
+brw, surf_offset, bo, obj->BufferOffset,
 format, buffer_size, texel_size,
 access != GL_READ_ONLY ? RELOC_WRITE : 0);
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): i965: Handle non-zero texture buffer offsets in buffer object range calculation.

2018-05-23 Thread Francisco Jerez
Module: Mesa
Branch: master
Commit: e989acb03ba802737f762627dd16ac1d0b9f0d13
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e989acb03ba802737f762627dd16ac1d0b9f0d13

Author: Francisco Jerez 
Date:   Fri Mar 16 14:35:10 2018 -0700

i965: Handle non-zero texture buffer offsets in buffer object range calculation.

Otherwise the specified surface state will allow the GPU to access
memory up to BufferOffset bytes past the end of the buffer.  Found by
inspection.

v2: Protect against out-of-range BufferOffset (Nanley).
Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Nanley Chery 

---

 src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c 
b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index af629a17bf..39e898243d 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -647,6 +647,7 @@ buffer_texture_range_size(struct brw_context *brw,
const unsigned texel_size = 
_mesa_get_format_bytes(obj->_BufferObjectFormat);
const unsigned buffer_size = (!obj->BufferObject ? 0 :
  obj->BufferObject->Size);
+   const unsigned buffer_offset = MIN2(buffer_size, obj->BufferOffset);
 
/* The ARB_texture_buffer_specification says:
 *
@@ -664,7 +665,8 @@ buffer_texture_range_size(struct brw_context *brw,
 * so that when ISL divides by stride to obtain the number of texels, that
 * texel count is clamped to MAX_TEXTURE_BUFFER_SIZE.
 */
-   return MIN3((unsigned)obj->BufferSize, buffer_size,
+   return MIN3((unsigned)obj->BufferSize,
+   buffer_size - buffer_offset,
brw->ctx.Const.MaxTextureBufferSize * texel_size);
 }
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): i965: Move buffer texture size calculation into a common helper function.

2018-05-23 Thread Francisco Jerez
Module: Mesa
Branch: master
Commit: 156d2c6e621d836c4d45c636b87669e1de3d4464
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=156d2c6e621d836c4d45c636b87669e1de3d4464

Author: Francisco Jerez 
Date:   Fri Mar 16 13:06:26 2018 -0700

i965: Move buffer texture size calculation into a common helper function.

The buffer texture size calculations (should be easy enough, right?)
are repeated in three different places, each of them subtly broken in
a different way.  E.g. the image load/store path was never fixed to
clamp to MaxTextureBufferSize, and none of them are taking into
account the buffer offset correctly.  It's easier to fix it all in one
place.

Cc: mesa-sta...@lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106481
Reviewed-by: Nanley Chery 

---

 src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 55 ++--
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c 
b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 67438b0f7e..af629a17bf 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -639,26 +639,14 @@ brw_emit_buffer_surface_state(struct brw_context *brw,
  .mocs = brw_get_bo_mocs(devinfo, bo));
 }
 
-void
-brw_update_buffer_texture_surface(struct gl_context *ctx,
-  unsigned unit,
-  uint32_t *surf_offset)
+static unsigned
+buffer_texture_range_size(struct brw_context *brw,
+  struct gl_texture_object *obj)
 {
-   struct brw_context *brw = brw_context(ctx);
-   struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current;
-   struct intel_buffer_object *intel_obj =
-  intel_buffer_object(tObj->BufferObject);
-   uint32_t size = tObj->BufferSize;
-   struct brw_bo *bo = NULL;
-   mesa_format format = tObj->_BufferObjectFormat;
-   const enum isl_format isl_format = brw_isl_format_for_mesa_format(format);
-   int texel_size = _mesa_get_format_bytes(format);
-
-   if (intel_obj) {
-  size = MIN2(size, intel_obj->Base.Size);
-  bo = intel_bufferobj_buffer(brw, intel_obj, tObj->BufferOffset, size,
-  false);
-   }
+   assert(obj->Target == GL_TEXTURE_BUFFER);
+   const unsigned texel_size = 
_mesa_get_format_bytes(obj->_BufferObjectFormat);
+   const unsigned buffer_size = (!obj->BufferObject ? 0 :
+ obj->BufferObject->Size);
 
/* The ARB_texture_buffer_specification says:
 *
@@ -676,7 +664,28 @@ brw_update_buffer_texture_surface(struct gl_context *ctx,
 * so that when ISL divides by stride to obtain the number of texels, that
 * texel count is clamped to MAX_TEXTURE_BUFFER_SIZE.
 */
-   size = MIN2(size, ctx->Const.MaxTextureBufferSize * (unsigned) texel_size);
+   return MIN3((unsigned)obj->BufferSize, buffer_size,
+   brw->ctx.Const.MaxTextureBufferSize * texel_size);
+}
+
+void
+brw_update_buffer_texture_surface(struct gl_context *ctx,
+  unsigned unit,
+  uint32_t *surf_offset)
+{
+   struct brw_context *brw = brw_context(ctx);
+   struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current;
+   struct intel_buffer_object *intel_obj =
+  intel_buffer_object(tObj->BufferObject);
+   const unsigned size = buffer_texture_range_size(brw, tObj);
+   struct brw_bo *bo = NULL;
+   mesa_format format = tObj->_BufferObjectFormat;
+   const enum isl_format isl_format = brw_isl_format_for_mesa_format(format);
+   int texel_size = _mesa_get_format_bytes(format);
+
+   if (intel_obj)
+  bo = intel_bufferobj_buffer(brw, intel_obj, tObj->BufferOffset, size,
+  false);
 
if (isl_format == ISL_FORMAT_UNSUPPORTED) {
   _mesa_problem(NULL, "bad format %s for texture buffer\n",
@@ -1477,8 +1486,7 @@ update_buffer_image_param(struct brw_context *brw,
   unsigned surface_idx,
   struct brw_image_param *param)
 {
-   struct gl_buffer_object *obj = u->TexObj->BufferObject;
-   const uint32_t size = MIN2((uint32_t)u->TexObj->BufferSize, obj->Size);
+   const unsigned size = buffer_texture_range_size(brw, u->TexObj);
update_default_image_param(brw, u, surface_idx, param);
 
param->size[0] = size / _mesa_get_format_bytes(u->_ActualFormat);
@@ -1514,10 +1522,11 @@ update_image_surface(struct brw_context *brw,
 intel_buffer_object(obj->BufferObject);
  const unsigned texel_size = (format == ISL_FORMAT_RAW ? 1 :
   
_mesa_get_format_bytes(u->_ActualFormat));
+ const unsigned buffer_size = buffer_texture_range_size(brw, obj);
 
  brw_emit_buffer_surface_state(
 brw, surf_offset, intel_obj->buffer, obj->BufferOffset,
-   

Mesa (master): Revert "mesa: simplify _mesa_is_image_unit_valid for buffers"

2018-05-23 Thread Francisco Jerez
Module: Mesa
Branch: master
Commit: 5a6814780322988a7adee525899bca8a83907ab7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a6814780322988a7adee525899bca8a83907ab7

Author: Francisco Jerez 
Date:   Fri Mar 16 13:43:27 2018 -0700

Revert "mesa: simplify _mesa_is_image_unit_valid for buffers"

This reverts commit c0ed52f6146c7e24e1275451773bd47c1eda3145.  It was
preventing the image format validation from being done on buffer
textures, which is required to ensure that the application doesn't
attempt to bind a buffer texture with an internal format incompatible
with the image unit format (e.g. of different texel size), which is
not allowed by the spec (it's not allowed for *any* texture target,
whether or not there is spec wording restricting this behavior
specifically for buffer textures) and will cause the driver to
calculate texel bounds incorrectly and potentially crash instead of
the expected behavior.

Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Marek Olšák 
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106465
Reviewed-by: Nanley Chery 

---

 src/mesa/main/shaderimage.c | 25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/mesa/main/shaderimage.c b/src/mesa/main/shaderimage.c
index feff8ccd91..31ac852d37 100644
--- a/src/mesa/main/shaderimage.c
+++ b/src/mesa/main/shaderimage.c
@@ -478,13 +478,6 @@ _mesa_is_image_unit_valid(struct gl_context *ctx, struct 
gl_image_unit *u)
if (!t)
   return GL_FALSE;
 
-   /* The GL 4.5 Core spec doesn't say anything about buffers. In practice,
-* the image buffer format is always compatible with the underlying
-* buffer storage.
-*/
-   if (t->Target == GL_TEXTURE_BUFFER)
-  return GL_TRUE;
-
if (!t->_BaseComplete && !t->_MipmapComplete)
_mesa_test_texobj_completeness(ctx, t);
 
@@ -498,14 +491,20 @@ _mesa_is_image_unit_valid(struct gl_context *ctx, struct 
gl_image_unit *u)
u->_Layer >= _mesa_get_texture_layers(t, u->Level))
   return GL_FALSE;
 
-   struct gl_texture_image *img = (t->Target == GL_TEXTURE_CUBE_MAP ?
-   t->Image[u->_Layer][u->Level] :
-   t->Image[0][u->Level]);
+   if (t->Target == GL_TEXTURE_BUFFER) {
+  tex_format = _mesa_get_shader_image_format(t->BufferObjectFormat);
 
-   if (!img || img->Border || img->NumSamples > ctx->Const.MaxImageSamples)
-  return GL_FALSE;
+   } else {
+  struct gl_texture_image *img = (t->Target == GL_TEXTURE_CUBE_MAP ?
+  t->Image[u->_Layer][u->Level] :
+  t->Image[0][u->Level]);
+
+  if (!img || img->Border || img->NumSamples > ctx->Const.MaxImageSamples)
+ return GL_FALSE;
+
+  tex_format = _mesa_get_shader_image_format(img->InternalFormat);
+   }
 
-   tex_format = _mesa_get_shader_image_format(img->InternalFormat);
if (!tex_format)
   return GL_FALSE;
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): ac: Use DPP for build_ddxy where possible.

2018-05-23 Thread Bas Nieuwenhuizen
Module: Mesa
Branch: master
Commit: 699e1f5aacd1d9eed8cc1a37ec0dbd11313fbbdc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=699e1f5aacd1d9eed8cc1a37ec0dbd11313fbbdc

Author: Bas Nieuwenhuizen 
Date:   Wed May 23 11:34:15 2018 +0200

ac: Use DPP for build_ddxy where possible.

WQM is pretty reliable now on LLVM 7, so let us just use
DPP + WQM.

This gives approximately a 1.5% performance increase on the
vrcompositor built-in benchmark.

v2: Use ac_build_quad_swizzle.

Reviewed-by: Nicolai Hähnle 

---

 src/amd/common/ac_llvm_build.c | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index 36c1d62637..4eebbbd4d9 100644
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -1170,7 +1170,21 @@ ac_build_ddxy(struct ac_llvm_context *ctx,
LLVMValueRef tl, trbl, args[2];
LLVMValueRef result;
 
-   if (ctx->chip_class >= VI) {
+   if (HAVE_LLVM >= 0x0700) {
+   unsigned tl_lanes[4], trbl_lanes[4];
+
+   for (unsigned i = 0; i < 4; ++i) {
+   tl_lanes[i] = i & mask;
+   trbl_lanes[i] = (i & mask) + idx;
+   }
+
+   tl = ac_build_quad_swizzle(ctx, val,
+  tl_lanes[0], tl_lanes[1],
+  tl_lanes[2], tl_lanes[3]);
+   trbl = ac_build_quad_swizzle(ctx, val,
+trbl_lanes[0], trbl_lanes[1],
+trbl_lanes[2], trbl_lanes[3]);
+   } else if (ctx->chip_class >= VI) {
LLVMValueRef thread_id, tl_tid, trbl_tid;
thread_id = ac_get_thread_id(ctx);
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): dri_util: Add R10G10B10{A,X}2 translation between DRI and mesa_format.

2018-05-23 Thread Chad Versace
Module: Mesa
Branch: master
Commit: 432df741e0b85c021da0ac027aa25cd4dc1454c6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=432df741e0b85c021da0ac027aa25cd4dc1454c6

Author: Miguel Casas 
Date:   Mon May  7 11:45:20 2018 -0400

dri_util: Add R10G10B10{A,X}2 translation between DRI and mesa_format.

Add R10G10B10{A,X}2 translation between mesa_format and DRI format
to driGLFormatToImageFormat() and driImageFormatToGLFormat().

Bug: https://crbug.com/776093
Reviewed-by: Chad Versace 
Reviewed-by: Tapani Pälli 

---

 src/mesa/drivers/dri/common/dri_util.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/src/mesa/drivers/dri/common/dri_util.c 
b/src/mesa/drivers/dri/common/dri_util.c
index 75d124097b..c58650491d 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -878,6 +878,10 @@ driGLFormatToImageFormat(mesa_format format)
   return __DRI_IMAGE_FORMAT_ARGB2101010;
case MESA_FORMAT_B10G10R10X2_UNORM:
   return __DRI_IMAGE_FORMAT_XRGB2101010;
+   case MESA_FORMAT_R10G10B10A2_UNORM:
+  return __DRI_IMAGE_FORMAT_ABGR2101010;
+   case MESA_FORMAT_R10G10B10X2_UNORM:
+  return __DRI_IMAGE_FORMAT_XBGR2101010;
case MESA_FORMAT_B8G8R8A8_UNORM:
   return __DRI_IMAGE_FORMAT_ARGB;
case MESA_FORMAT_R8G8B8A8_UNORM:
@@ -915,6 +919,10 @@ driImageFormatToGLFormat(uint32_t image_format)
   return MESA_FORMAT_B10G10R10A2_UNORM;
case __DRI_IMAGE_FORMAT_XRGB2101010:
   return MESA_FORMAT_B10G10R10X2_UNORM;
+   case __DRI_IMAGE_FORMAT_ABGR2101010:
+  return MESA_FORMAT_R10G10B10A2_UNORM;
+   case __DRI_IMAGE_FORMAT_XBGR2101010:
+  return MESA_FORMAT_R10G10B10X2_UNORM;
case __DRI_IMAGE_FORMAT_ARGB:
   return MESA_FORMAT_B8G8R8A8_UNORM;
case __DRI_IMAGE_FORMAT_ABGR:

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): i965: add {X,A}BGR2101010 to 'intel_image_formats'

2018-05-23 Thread Chad Versace
Module: Mesa
Branch: master
Commit: b73b340c37c6b3f1ac0636b385a5403c62a9777e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b73b340c37c6b3f1ac0636b385a5403c62a9777e

Author: Miguel Casas 
Date:   Mon May  7 11:45:21 2018 -0400

i965: add {X,A}BGR2101010 to 'intel_image_formats'

This patch adds {X,A}BGR2101010 entries to the list of supported
'intel_image_formats'.

Bug: https://crbug.com/776093
Reviewed-by: Chad Versace 
Reviewed-by: Tapani Pälli 

---

 src/mesa/drivers/dri/i965/intel_screen.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c 
b/src/mesa/drivers/dri/i965/intel_screen.c
index 4b0a573eaf..ab6c003b0f 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -190,6 +190,12 @@ static const struct intel_image_format 
intel_image_formats[] = {
{ __DRI_IMAGE_FOURCC_XRGB2101010, __DRI_IMAGE_COMPONENTS_RGB, 1,
  { { 0, 0, 0, __DRI_IMAGE_FORMAT_XRGB2101010, 4 } } },
 
+   { __DRI_IMAGE_FOURCC_ABGR2101010, __DRI_IMAGE_COMPONENTS_RGBA, 1,
+ { { 0, 0, 0, __DRI_IMAGE_FORMAT_ABGR2101010, 4 } } },
+
+   { __DRI_IMAGE_FOURCC_XBGR2101010, __DRI_IMAGE_COMPONENTS_RGB, 1,
+ { { 0, 0, 0, __DRI_IMAGE_FORMAT_XBGR2101010, 4 } } },
+
{ __DRI_IMAGE_FOURCC_ARGB, __DRI_IMAGE_COMPONENTS_RGBA, 1,
  { { 0, 0, 0, __DRI_IMAGE_FORMAT_ARGB, 4 } } },
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): bin/get-pick-listh.sh: force git --pretty=medium

2018-05-23 Thread Dylan Baker
Module: Mesa
Branch: master
Commit: c8acfd5ab28e8134c9da6ce781180fa3df5967ca
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8acfd5ab28e8134c9da6ce781180fa3df5967ca

Author: Dylan Baker 
Date:   Mon May 21 10:30:42 2018 -0700

bin/get-pick-listh.sh: force git --pretty=medium

Signed-off-by: Dylan Baker 
Reviewed-by: Kenneth Graunke 
Reviewed-by: Andres Gomez 

---

 bin/get-pick-list.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 1bd0b367d8..9e9a39e494 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -12,7 +12,7 @@
 latest_branchpoint=`git merge-base origin/master HEAD`
 
 # Grep for commits with "cherry picked from commit" in the commit message.
-git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD 
|\
+git log --reverse --pretty=medium --grep="cherry picked from commit" 
$latest_branchpoint..HEAD |\
grep "cherry picked from commit" |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 
's/)//' > already_picked
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): bin/bugzilla_mesa.sh: explicitly set the --pretty argument

2018-05-23 Thread Dylan Baker
Module: Mesa
Branch: master
Commit: 5a639bdb810f89a9ab1018619bd2d8e9cad58a14
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a639bdb810f89a9ab1018619bd2d8e9cad58a14

Author: Dylan Baker 
Date:   Mon May 21 10:28:34 2018 -0700

bin/bugzilla_mesa.sh: explicitly set the --pretty argument

Signed-off-by: Dylan Baker 
Reviewed-by: Kenneth Graunke 
Reviewed-by: Andres Gomez 

---

 bin/bugzilla_mesa.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/bugzilla_mesa.sh b/bin/bugzilla_mesa.sh
index a8f5305844..9095bc9dee 100755
--- a/bin/bugzilla_mesa.sh
+++ b/bin/bugzilla_mesa.sh
@@ -23,7 +23,7 @@ echo ""
 echo ""
 
 # extract fdo urls from commit log
-git log $* | grep 'bugs.freedesktop.org/show_bug' | sed -e $trim_before | sort 
-n -u | sed -e $use_after |\
+git log --pretty=medium $* | grep 'bugs.freedesktop.org/show_bug' | sed -e 
$trim_before | sort -n -u | sed -e $use_after |\
 while read url
 do
id=$(echo $url | cut -d'=' -f2)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): docs: fix various html tags mistakes

2018-05-23 Thread Eric Engeström
Module: Mesa
Branch: master
Commit: 09a6cb7be668a975a49f4c37fbffd58e47629b9f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=09a6cb7be668a975a49f4c37fbffd58e47629b9f

Author: Eric Engestrom 
Date:   Wed May 23 12:46:44 2018 +0100

docs: fix various html tags mistakes

Signed-off-by: Eric Engestrom 
Reviewed-by: Ian Romanick 

---

 docs/egl.html | 1 +
 docs/precompiled.html | 2 ++
 docs/utilities.html   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/egl.html b/docs/egl.html
index 3d8a85b4e7..2bc8f23727 100644
--- a/docs/egl.html
+++ b/docs/egl.html
@@ -168,6 +168,7 @@ the X server directly using (XCB-)DRI2 protocol.
 This driver can share DRI drivers with libGL.
 
 
+
 
 Packaging
 
diff --git a/docs/precompiled.html b/docs/precompiled.html
index d1f4acec4d..97dc1ff4bd 100644
--- a/docs/precompiled.html
+++ b/docs/precompiled.html
@@ -24,10 +24,12 @@ Some Linux distributions closely follow the latest Mesa 
releases. On others one
 has to use unofficial channels.
 
 There are some general directions:
+
 Debian/Ubuntu based distros - PPA: xorg-edgers, oibaf and padoka
 Fedora - Corp: erp and che
 OpenSuse/SLES - OBS: X11:XOrg and pontostroy:X11
 Gentoo/Archlinux - officially provided/supported
+
 
 
 
diff --git a/docs/utilities.html b/docs/utilities.html
index c141abeefe..222e734389 100644
--- a/docs/utilities.html
+++ b/docs/utilities.html
@@ -31,7 +31,7 @@
   is a very useful tool for tracking down
   memory-related problems in your code.
 
-  https://scan.coverity.com/projects/mesa;>Coverity
+  https://scan.coverity.com/projects/mesa;>Coverity
   provides static code analysis of Mesa.  If you create an account
   you can see the results and try to fix outstanding issues.
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): docs: drop unnecessary out-of-frame target

2018-05-23 Thread Eric Engeström
Module: Mesa
Branch: master
Commit: ec986241f317222b0d0638095a124edb2e6cb46b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec986241f317222b0d0638095a124edb2e6cb46b

Author: Eric Engestrom 
Date:   Wed May 23 12:47:33 2018 +0100

docs: drop unnecessary out-of-frame target

I'm guessing an earlier version of the website used to have the page
contents in , but this isn't the case anymore so just drop the
unnecessary `target="_main"` :)

Signed-off-by: Eric Engestrom 
Reviewed-by: Ian Romanick 

---

 docs/viewperf.html | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/viewperf.html b/docs/viewperf.html
index 0eb51a5662..ed89ee2cfe 100644
--- a/docs/viewperf.html
+++ b/docs/viewperf.html
@@ -18,8 +18,8 @@
 
 
 This page lists known issues with
-https://www.spec.org/gwpg/gpc.static/vp11info.html; 
target="_main">SPEC Viewperf 11
-and https://www.spec.org/gwpg/gpc.static/vp12info.html; 
target="_main">SPEC Viewperf 12
+https://www.spec.org/gwpg/gpc.static/vp11info.html;>SPEC Viewperf 
11
+and https://www.spec.org/gwpg/gpc.static/vp12info.html;>SPEC Viewperf 
12
 when running on Mesa-based drivers.
 
 
@@ -66,13 +66,10 @@ either in Viewperf or the Mesa driver.
 
 
 These tests use features of the
-https://www.opengl.org/registry/specs/NV/fragment_program2.txt;
-target="_main">
-GL_NV_fragment_program2 and
-https://www.opengl.org/registry/specs/NV/vertex_program3.txt;
-target="_main">
-GL_NV_vertex_program3 extensions without checking if the driver supports
-them.
+https://www.opengl.org/registry/specs/NV/fragment_program2.txt;>GL_NV_fragment_program2
+and
+https://www.opengl.org/registry/specs/NV/vertex_program3.txt;>GL_NV_vertex_program3
+extensions without checking if the driver supports them.
 
 
 When Mesa tries to compile the vertex/fragment programs it generates errors
@@ -86,8 +83,8 @@ Subsequent drawing calls become no-ops and the rendering is 
incorrect.
 
 
 These tests depend on the
-https://www.opengl.org/registry/specs/NV/primitive_restart.txt;
-target="_main">GL_NV_primitive_restart extension.
+https://www.opengl.org/registry/specs/NV/primitive_restart.txt;>GL_NV_primitive_restart
+extension.
 
 
 
@@ -124,7 +121,7 @@ never specified.
 
 
 A trace captured with
-https://github.com/apitrace/apitrace; target="_main">API trace
+https://github.com/apitrace/apitrace;>API trace
 shows this sequences of calls like this:
 
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): docs: fix `<` & `>` used in html code

2018-05-23 Thread Eric Engeström
Module: Mesa
Branch: master
Commit: 8034f5f6236e4a94bb49f5b467532b236d51e912
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8034f5f6236e4a94bb49f5b467532b236d51e912

Author: Eric Engestrom 
Date:   Wed May 23 12:46:00 2018 +0100

docs: fix `<` & `>` used in html code

Signed-off-by: Eric Engestrom 
Reviewed-by: Ian Romanick 

---

 docs/codingstyle.html   | 4 ++--
 docs/submittingpatches.html | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/codingstyle.html b/docs/codingstyle.html
index 7e9f470a10..34acae27fe 100644
--- a/docs/codingstyle.html
+++ b/docs/codingstyle.html
@@ -83,7 +83,7 @@ We try to quote the OpenGL specification where prudent:
 * "An INVALID_OPERATION error is generated for any of the following
 * conditions:
 *
-* *  is zero."
+* * length is zero."
 *
 * Additionally, page 94 of the PDF of the OpenGL 4.5 core spec
 * (30.10.2014) also says this, so it's no longer allowed for desktop GL,
@@ -94,7 +94,7 @@ Function comment example:
 
/**
 * Create and initialize a new buffer object.  Called via the
-* ctx->Driver.CreateObject() driver callback function.
+* ctx-Driver.CreateObject() driver callback function.
 * \param  name  integer name of the object
 * \param  type  one of GL_FOO, GL_BAR, etc.
 * \return  pointer to new object or NULL if error
diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index ba09aa4ad7..178ec5f89e 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -122,9 +122,9 @@ Please use common sense and do not blindly 
add everyone.
 
 $ scripts/get_reviewer.pl --help # to get the help screen
 $ scripts/get_reviewer.pl -f src/egl/drivers/dri2/platform_android.c
-Rob Herring  (reviewer:ANDROID EGL 
SUPPORT,added_lines:188/700=27%,removed_lines:58/283=20%)
-Tomasz Figa  (reviewer:ANDROID EGL 
SUPPORT,authored:12/41=29%,added_lines:308/700=44%,removed_lines:115/283=41%)
-Emil Velikov  
(authored:13/41=32%,removed_lines:76/283=27%)
+Rob Herring r...@kernel.org (reviewer:ANDROID EGL 
SUPPORT,added_lines:188/700=27%,removed_lines:58/283=20%)
+Tomasz Figa tf...@chromium.org (reviewer:ANDROID EGL 
SUPPORT,authored:12/41=29%,added_lines:308/700=44%,removed_lines:115/283=41%)
+Emil Velikov emil.l.veli...@gmail.com 
(authored:13/41=32%,removed_lines:76/283=27%)
 
 
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (master): docs: add news notes to 18.1.0

2018-05-23 Thread Juan Antonio Suárez Romero
Module: Mesa
Branch: master
Commit: 6db0660d089ab2172c8774ba424cf967d45703f1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6db0660d089ab2172c8774ba424cf967d45703f1

Author: Juan A. Suarez Romero 
Date:   Tue May 22 09:33:19 2018 +0200

docs: add news notes to 18.1.0

CC: Dylan Baker 
Reviewed-by: Dylan Baker 
Reviewed-by: Andres Gomez 

---

 docs/index.html | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/docs/index.html b/docs/index.html
index 5644ead731..34418e9bdc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,13 @@
 
 News
 
+May 18, 2018
+
+Mesa 18.1.0 is released.  This is a
+new development release.  See the release notes for more information
+about the release.
+
+
 May 17, 2018
 
 Mesa 18.0.4 is released.

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit