Re: [Mesa-dev] [PATCH 1/4] nv50ir: fix memset on non trivial types warning

[Rhys Kidd]

On Sat, 21 Sep 2019 at 04:27, Karol Herbst  wrote:

> Signed-off-by: Karol Herbst 
>

Reviewed-by: Rhys Kidd 


> ---
>  src/gallium/drivers/nouveau/codegen/nv50_ir.cpp| 4 +---
>  src/gallium/drivers/nouveau/codegen/nv50_ir.h  | 2 +-
>  src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp | 2 +-
>  3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
> b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
> index a181a13a3b1..45ee95bb103 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
> @@ -903,10 +903,8 @@ Instruction::isCommutationLegal(const Instruction *i)
> const
>  }
>
>  TexInstruction::TexInstruction(Function *fn, operation op)
> -   : Instruction(fn, op, TYPE_F32)
> +   : Instruction(fn, op, TYPE_F32), tex()
>  {
> -   memset(, 0, sizeof(tex));
> -
> tex.rIndirectSrc = -1;
> tex.sIndirectSrc = -1;
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h
> b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
> index b19751ab372..5163e1a7ec2 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
> @@ -957,7 +957,7 @@ public:
> class Target
> {
> public:
> -  Target(TexTarget targ = TEX_TARGET_2D) : target(targ) { }
> +  Target(TexTarget targ = TEX_TARGET_1D) : target(targ) { }
>
>const char *getName() const { return descTable[target].name; }
>unsigned int getArgCount() const { return descTable[target].argc; }
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp
> b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp
> index 5c6d0570ae2..609e7b89290 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp
> @@ -455,7 +455,7 @@ CodeEmitter::addInterp(int ipa, int reg, FixupApply
> apply)
>if (!fixupInfo)
>   return false;
>if (n == 0)
> - memset(fixupInfo, 0, sizeof(FixupInfo));
> + fixupInfo->count = 0;
> }
> ++fixupInfo->count;
>
> --
> 2.21.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 3/4] nv50ir/nir: comparison of integer expressions of different signedness warning

[Rhys Kidd]

On Sat, 21 Sep 2019 at 04:27, Karol Herbst  wrote:

> Signed-off-by: Karol Herbst 
>

Reviewed-by: Rhys Kidd 


> ---
>  src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
> b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
> index 4e86ab8f8cc..95b60d2c7d0 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
> @@ -1957,7 +1957,7 @@ Converter::visit(nir_intrinsic_instr *insn)
>   }
>   case Program::TYPE_GEOMETRY:
>   case Program::TYPE_VERTEX: {
> -if (info->io.genUserClip > 0 && idx == clipVertexOutput) {
> +if (info->io.genUserClip > 0 && idx ==
> (uint32_t)clipVertexOutput) {
> mkMov(clipVtx[i], src);
> src = clipVtx[i];
>  }
> --
> 2.21.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/4] nv50ir: fix unnecessary parentheses warning

[Rhys Kidd]

On Sat, 21 Sep 2019 at 04:27, Karol Herbst  wrote:

> Signed-off-by: Karol Herbst 
>

Reviewed-by: Rhys Kidd 


> ---
>  src/gallium/drivers/nouveau/codegen/nv50_ir_util.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h
> b/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h
> index 307c23d5e03..b1766f48205 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h
> @@ -145,7 +145,7 @@ public:
>  #define DLLIST_EMPTY(__list) ((__list)->next == (__list))
>
>  #define DLLIST_FOR_EACH(list, it) \
> -   for (DLList::Iterator (it) = (list)->iterator(); !(it).end();
> (it).next())
> +   for (DLList::Iterator it = (list)->iterator(); !(it).end();
> (it).next())
>
>  class DLList
>  {
> --
> 2.21.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] nv50, nvc0: add missing CAPs for unsupported features

[Rhys Kidd]

Signed-off-by: Rhys Kidd 
---
 src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 ++
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c 
b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
index d83926f2b1c..0c53b22eb3c 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
@@ -310,6 +310,8 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum 
pipe_cap param)
case PIPE_CAP_MAX_COMBINED_HW_ATOMIC_COUNTER_BUFFERS:
case PIPE_CAP_SURFACE_SAMPLE_COUNT:
case PIPE_CAP_TGSI_ATOMFADD:
+   case PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE:
+   case PIPE_CAP_RGB_OVERRIDE_DST_ALPHA_BLEND:
   return 0;
 
case PIPE_CAP_VENDOR_ID:
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c 
b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index f5f3cfd..68b5869276a 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -334,6 +334,8 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum 
pipe_cap param)
case PIPE_CAP_MAX_COMBINED_HW_ATOMIC_COUNTERS:
case PIPE_CAP_MAX_COMBINED_HW_ATOMIC_COUNTER_BUFFERS:
case PIPE_CAP_SURFACE_SAMPLE_COUNT:
+   case PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE:
+   case PIPE_CAP_RGB_OVERRIDE_DST_ALPHA_BLEND:
   return 0;
 
case PIPE_CAP_VENDOR_ID:
-- 
2.19.1

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

[Mesa-dev] [MR] nv50, nvc0: add missing CAPs for unsupported features

[Rhys Kidd]

nouveau warns on unhandled pipe CAPs, including where they may be set by
u_pipe_screen_get_param_defaults()

This patch avoids spurious text in debug outputs, e.g. when running piglit.

https://gitlab.freedesktop.org/mesa/mesa/merge_requests/133

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

Re: [Mesa-dev] [PATCH 0/2] Restore optional xf86vidmode

[Rhys Kidd]

On Tue, 11 Dec 2018 at 10:22, Jon Turney 
wrote:

> Restore optional xf86vidmode, and fix the meson build to actually use it.
>
> Jon Turney (2):
>   Revert "glx: make xf86vidmode mandatory for direct rendering"
>   Fix typo preventing xxf86vm being used in meson build
>

Jon I don't believe these patches ever landed in master.
Did you want to continue pushing them forward, as they were either
Reviewed-by or Ack'ed it seems.


>  configure.ac| 12 +++-
>  meson.build |  6 --
>  src/glx/Makefile.am |  5 +
>  src/glx/SConscript  |  5 -
>  src/glx/glxcmds.c   |  7 ++-
>  src/glx/meson.build |  4 
>  6 files changed, 34 insertions(+), 5 deletions(-)
>
> --
> 2.17.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] vc4: Wire up core pipe_debug_callback

[Rhys Kidd]

Awesome, thanks! Apologies that I was unable to get around to looking at
your feedback in the intervening period of time.

On Thu, Dec 20, 2018 at 2:34 PM Eric Anholt  wrote:

> Eric Anholt  writes:
>
> > [ Unknown signature status ]
> > Rhys Kidd  writes:
> >
> >> Signed-off-by: Rhys Kidd 
> >
> > Does this actually do anything for us, though?  Shouldn't we be hooking
> > up our perf_debug() calls to it?
>
> I hooked up perf_debug(), extended the commit messages, and pushed.
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] iris: Fix assertion in iris_resource_from_handle() tiling usage

[Rhys Kidd]

Assertion error:

  iris_resource_from_handle: Assertion `res->bo->tiling_mode ==
  isl_tiling_to_i915_tiling(res->surf.tiling)' failed.

This patch fixes 16 piglit tests on KBL:
glx/glx-multithread-texture
glx/glx-query-drawable-glx_fbconfig_id-glxpbuffer
glx/glx-query-drawable-glx_fbconfig_id-glxpixmap
glx/glx-query-drawable-glx_preserved_contents
glx/glx-query-drawable-glxpbuffer-glx_height
glx/glx-query-drawable-glxpbuffer-glx_width
glx/glx-query-drawable-glxpixmap-glx_height
glx/glx-query-drawable-glxpixmap-glx_width
glx/glx-swap-pixmap
glx/glx-swap-pixmap-bad
glx/glx-tfp
glx/glx-visuals-depth -pixmap
glx/glx-visuals-stencil -pixmap
spec/egl 1.4/eglcreatepbuffersurface and then glclear
spec/egl 1.4/largest possible eglcreatepbuffersurface and then glclear
spec/egl_nok_texture_from_pixmap/basic

Cc: Kenneth Graunke 
Cc: Jason Ekstrand 
Signed-off-by: Rhys Kidd 
---
 src/gallium/drivers/iris/iris_resource.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_resource.c 
b/src/gallium/drivers/iris/iris_resource.c
index f3516ae8900..e717fafb1e6 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -467,8 +467,7 @@ iris_resource_from_handle(struct pipe_screen *pscreen,
   isl_drm_modifier_get_info(modifier);
assert(mod_info);
 
-   // XXX: usage...
-   isl_surf_usage_flags_t isl_usage = ISL_SURF_USAGE_DISPLAY_BIT;
+   isl_surf_usage_flags_t isl_usage = pipe_bind_to_isl_usage(templ->bind);
 
const struct iris_format_info fmt =
   iris_format_for_usage(devinfo, templ->format, isl_usage);
-- 
2.19.1

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

Re: [Mesa-dev] [PATCH 00/18] Meson fixes and Travis integration

[Rhys Kidd]

On Thu, 13 Dec 2018 at 11:08, Emil Velikov  wrote:

> Hi guys,
>
> While hacking on the integration I've spotted a few issues with our
> meson build - patches 1-6.
>
> The rest of the series is Dylan's patches followed by a build matrix
> analogous to the autotools/make one.
>
> As-is this causes one issue on macOS due to overly strict guards in the
> meson code.
>
> I've respinned the series more than 10 times and everything else seems
> solid. Personally I prefer if we get this (or anything functionally
> analogous) and address macOS as follow-up.
>
> Let me know what you think.
> Emil
>
> Cc: Rhys Kidd 
> Cc: Dylan Baker 
>
>
For the series:
Acked-by: Rhys Kidd 


> Dylan Baker (3):
>   travis: meson: use native files to override llvm-config
>   travis: Don't try to read libdrm out of configure.ac
>   travis: meson: enable unit tests
>
> Emil Velikov (15):
>   meson: don't require glx/egl/gbm with gallium drivers
>   pipe-loader: meson: reference correct library
>   glx: meson: build src/glx only with -Dglx=dri
>   glx: meson: drop includes from a link-only library
>   glx: meson: wire up the dispatch-index-check test
>   glx/test: meson: assorted include fixes
>   configure: add CXX11_CXXFLAGS to LLVM_CXXFLAGS
>   travis: flip to distro xenial, sudo true
>   travis: meson: print the configured state
>   travis: printout llvm-config --version
>   travis: meson: use FOO_DRIVERS directly
>   travis: meson: add unwind handling
>   travis: meson: explicitly control the DRI loaders
>   travis: meson: add explicit handling to gallium ST
>   travis: meson: port gallium build combinations over
>
>  .travis.yml | 353 +---
>  configure.ac|   1 +
>  meson.build |   6 +-
>  src/gallium/targets/pipe-loader/meson.build |   2 +-
>  src/glx/meson.build |  31 +-
>  src/glx/tests/meson.build   |   9 +-
>  src/meson.build |   2 +-
>  7 files changed, 267 insertions(+), 137 deletions(-)
>
> --
> 2.19.2
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] last call for autotools

[Rhys Kidd]

On Tue, 11 Dec 2018 at 16:46, Emil Velikov  wrote:

> On Tue, 11 Dec 2018 at 19:49, Dylan Baker  wrote:
> >
> > Quoting Emil Velikov (2018-12-11 10:48:56)
> > > On Tue, 11 Dec 2018 at 18:18, Eric Anholt  wrote:
> > > >
> > > > Emil Velikov  writes:
> > > >
> > > > > On Mon, 10 Dec 2018 at 23:11, Dylan Baker 
> wrote:
> > > > >>
> > > > >> Meson 0.49.0 has been out for a couple of days now, and I'd like
> to make the
> > > > >> final call for autotools. My patch is so massive that it's a huge
> pain to send
> > > > >> to the list, the latest versions is here:
> > > > >>
> https://gitlab.freedesktop.org/dbaker/mesa/commits/delete-autotools
> > > > >>
> > > > > Can you split this up a bit? I'm mostly conserved about a couple
> of things:
> > > > > - we're loosing multiple testing permutations with Travis -
> there's no
> > > > > meson equivalent
> > > > > - needed/missing bits are impossible to spot as-is
> > > > >
> > > > > Personally, I'd do something like:
> > > > >  - move .travis autotools permutations to meson
> > > > >  - docs changes
> > > > >  - rm Makefile{.*,}.am autogen.sh and configure.ac
> > > > >  - rm Makefile.sources
> > > > >  - .gitignore
> > > >
> > > > I don't think we should block on anything related to travis at this
> > > > point.  I wrote it initially hoping it would let us prevent build
> > > > breakages.  Instead, whenever I try to use travis to prevent build
> > > > breakage, I find that travis has already been broken for a while.
> > > >
> > > You must be really unlucky.
> > >
> > > > The CI needs to be integrated with our actual repository host, or it
> > > > doesn't work.  We should just delete .travis.yml and push the gitlab
> > > > stuff forward instead.
> > >
> > > If we have anything better in place (say gitlab CI/other) - sure.
> > > Removing something without a replacement in place is quite meh.
> > > That said, I think we agree that this is a topic for another day.
> > >
> > > HTH
> > > -Emil
> >
> > I'm actually finding myself agreeing that travis is just a pain. Could
> you help
> > me debug my WIP of porting the autotools tests to meson? They're just
> failing
> > randomly with no good debuging output:
> >
> > https://travis-ci.org/dcbaker/mesa/jobs/45289
> >
> If you don't mind I'll have a look first thing tomorrow morning. It's
> 9:43pm and I've yet to cook some food :-\
>

I was able to catch and fix most of the remaining meson / travis build
errors. RFC patch series on the mailing list that applies on top of Dylan's
WIP branch.

Hope that helps!


> -Emil
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [RFC PATCH 3/5] travis: radeonsi and radv require LLVM 7.0 (meson)

[Rhys Kidd]

Signed-off-by: Rhys Kidd 
---
 .travis.yml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 60ef236e7be..070c9ef6773 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,20 +81,21 @@ matrix:
 - VULKAN_DRIVERS=""
 - 
GALLIUM_DRIVERS="swrast,swr,r300,r600,radeonsi,nouveau,i915,vc4,v3d,pl111,freedreno,etnaviv,imx,tegra,svga,virgl"
 - MESON_OPTIONS="-Dgallium-opencl=standalone -Dgallium-nine=true"
-- LLVM_VERSION=6.0
+- LLVM_VERSION=7
 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
   addons:
 apt:
   sources:
-- llvm-toolchain-trusty-6.0
-# llvm-6 requires libstdc++4.9 which is not in main repo
+- sourceline: 'deb http://apt.llvm.org/trusty/ 
llvm-toolchain-trusty-7 main'
+  key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+# llvm-7 requires libstdc++4.9 which is not in main repo
 - ubuntu-toolchain-r-test
   packages:
 - libclc-dev
 # From sources above
-- llvm-6.0-dev
-- clang-6.0
-- libclang-6.0-dev
+- llvm-7-dev
+- clang-7
+- libclang-7-dev
 # Common
 - xz-utils
 - libexpat1-dev
-- 
2.19.1

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

[Mesa-dev] [RFC PATCH 5/5] meson: libfreedreno depends upon libdrm (for fence support)

[Rhys Kidd]

Error message building freedreno Gallium driver with meson:

  ../src/gallium/drivers/freedreno/freedreno_fence.c:27:21: fatal error: 
libsync.h: No such file or directory
   \#include 

Signed-off-by: Rhys Kidd 
---
 src/gallium/drivers/freedreno/meson.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/drivers/freedreno/meson.build 
b/src/gallium/drivers/freedreno/meson.build
index 366b1468bef..df3c743d41d 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -232,9 +232,7 @@ libfreedreno = static_library(
   include_directories : freedreno_includes,
   c_args : [freedreno_c_args, c_vis_args],
   cpp_args : [freedreno_cpp_args, cpp_vis_args],
-  dependencies : [
-idep_nir_headers
-  ],
+  dependencies : [dep_libdrm, idep_nir_headers],
 )
 
 driver_freedreno = declare_dependency(
-- 
2.19.1

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

[Mesa-dev] [RFC PATCH 2/5] travis: Add libclc-dev, clang and libclang-dev dependencies of clover

[Rhys Kidd]

Fixes: 98a3f027aaf ("travis: enable nine and clover")
Signed-off-by: Rhys Kidd 
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index aec1b001083..60ef236e7be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,8 +90,11 @@ matrix:
 # llvm-6 requires libstdc++4.9 which is not in main repo
 - ubuntu-toolchain-r-test
   packages:
+- libclc-dev
 # From sources above
 - llvm-6.0-dev
+- clang-6.0
+- libclang-6.0-dev
 # Common
 - xz-utils
 - libexpat1-dev
-- 
2.19.1

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

[Mesa-dev] [RFC PATCH 1/5] travis: fix python3.5 dependency for "meson Gallium Drivers"

[Rhys Kidd]

Error message:

  $ if test "x$BUILD" = xmeson; then sudo update-alternatives --install 
/usr/bin/python3 python3 /usr/bin/python3.5 10; pip3 install --user meson; pip3 
install --user mako; fi
  update-alternatives: error: alternative path /usr/bin/python3.5 doesn't exist
  Downloading/unpacking meson
Downloading meson-0.49.0.tar.gz (1.3MB): 1.3MB downloaded
Running setup.py (path:/tmp/pip_build_travis/meson/setup.py) egg_info for 
package meson
  Tried to install with an unsupported version of Python. Meson requires 
Python 3.5.0 or greater
  Complete output from command python setup.py egg_info:
  Tried to install with an unsupported version of Python. Meson requires 
Python 3.5.0 or greater
  
  Cleaning up...
  Command python setup.py egg_info failed with error code 1 in 
/tmp/pip_build_travis/meson
  Storing debug log for failure in /home/travis/.pip/pip.log

Fixes: 05edf75f42e ("wip")
Signed-off-by: Rhys Kidd 
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index fb86418b2b0..aec1b001083 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,6 +98,7 @@ matrix:
 - libx11-xcb-dev
 - libelf-dev
 - libunwind8-dev
+- python3.5
 - python3-pip
 
 before_install:
-- 
2.19.1

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

[Mesa-dev] [RFC PATCH 0/5] last call for autotools (meson travis fixes)

[Rhys Kidd]

Emil and Dylan,

I took a go at addressing the limited number of remaining meson-based
travis-ci errors. This series applies on top of the work Dylan circulated
yesterday, and which can be seen here:
 
>  Could you help me debug my WIP of porting the autotools tests
>  to meson? They're just failing randomly with no good debuging output:
>
>  https://travis-ci.org/dcbaker/mesa/jobs/45289

Dylan, if you pick these patches up you may want to squash those ones which
are 'Fixes' into the respective initial patch before any final push.

At this stage the failures are deterministic.

The remaining two known issues are:

  * -Dbuild-tests=true: anv is unable to build when this option is enabled.
This is unrelated to this series and occurs in master. At present meson
by default has different test coverage to autotools. See further here:
https://travis-ci.org/Echelon9/mesa/builds/466840665

  * gallium pipeloaders: There's an ongoing scoping problem with the LLVM
libraries as a dependency. I was unable to fix yet. See further here:
https://travis-ci.org/Echelon9/mesa/jobs/466861661#L9112   

Rhys Kidd (5):
  travis: fix python3.5 dependency for "meson Gallium Drivers"
  travis: Add libclc-dev, clang and libclang-dev dependencies of clover
  travis: radeonsi and radv require LLVM 7.0 (meson)
  travis: delete remaining scons residuals
  meson: libdfreedreno depends upon libdrm (for fence support)

 .travis.yml   | 25 ---
 src/gallium/drivers/freedreno/meson.build |  4 +---
 2 files changed, 10 insertions(+), 19 deletions(-)

-- 
2.19.1

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

[Mesa-dev] [RFC PATCH 4/5] travis: delete remaining scons residuals

[Rhys Kidd]

Fixes: 53d5129ded5 ("delete me: remove scons")
Signed-off-by: Rhys Kidd 
---
 .travis.yml | 12 
 1 file changed, 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 070c9ef6773..442afea3a74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -138,12 +138,6 @@ install:
   pip3 install --user mako;
 fi
 
-  # Install a more modern scons from pip.
-  - if test "x$BUILD" = xscons; then
-  pip2 install --user "scons>=2.4";
-  pip2 install --user mako;
-fi
-
   # Install dependencies where we require specific versions (or where
   # disallowed by Travis CI's package whitelisting).
 
@@ -247,12 +241,6 @@ install:
 fi
 
 script:
-  - if test "x$BUILD" = xscons; then
-  test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
-  test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
-  scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
-fi
-
   - |
 if test "x$BUILD" = xmeson; then
   MESON_OPTIONS="$MESON_OPTIONS -Dbuild-tests=true"
-- 
2.19.1

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

[Mesa-dev] [PATCH] travis: radeonsi and radv require LLVM 7.0

[Rhys Kidd]

Fixes: 3fbdcd942fe ("amd: remove support for LLVM 6.0")
Cc: Samuel Pitoiset 
Cc: Marek Olšák 
Cc: Emil Velikov 
Cc: Jan Vesely 
Cc: Andres Gomez 
Cc: Dylan Baker 
Signed-off-by: Rhys Kidd 
---
 .travis.yml | 29 -
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b50d49e143..8eceb4e86f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,17 +38,18 @@ matrix:
 - DRI_DRIVERS=""
 - GALLIUM_DRIVERS=""
 - VULKAN_DRIVERS="intel,amd"
-- LLVM_VERSION=6.0
+- LLVM_VERSION=7
 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
   addons:
 apt:
   sources:
-- llvm-toolchain-trusty-6.0
-# llvm-6 requires libstdc++4.9 which is not in main repo
+- sourceline: 'deb http://apt.llvm.org/trusty/ 
llvm-toolchain-trusty-7 main'
+  key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+# llvm-7 requires libstdc++4.9 which is not in main repo
 - ubuntu-toolchain-r-test
   packages:
 # From sources above
-- llvm-6.0-dev
+- llvm-7-dev
 # Common
 - xz-utils
 - libexpat1-dev
@@ -131,7 +132,7 @@ matrix:
 - BUILD=make
 - MAKEFLAGS="-j4"
 - MAKE_CHECK_COMMAND="true"
-- LLVM_VERSION=6.0
+- LLVM_VERSION=7
 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
 - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
 - DRI_DRIVERS=""
@@ -142,12 +143,13 @@ matrix:
   addons:
 apt:
   sources:
-- llvm-toolchain-trusty-6.0
-# llvm-6 requires libstdc++4.9 which is not in main repo
+- sourceline: 'deb http://apt.llvm.org/trusty/ 
llvm-toolchain-trusty-7 main'
+  key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+# llvm-7 requires libstdc++4.9 which is not in main repo
 - ubuntu-toolchain-r-test
   packages:
 # From sources above
-- llvm-6.0-dev
+- llvm-7-dev
 # Common
 - xz-utils
 - libexpat1-dev
@@ -305,7 +307,7 @@ matrix:
 - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
 - DRI_DRIVERS=""
 - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd 
--enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau 
--disable-va --disable-omx-bellagio --disable-gallium-osmesa"
-- GALLIUM_DRIVERS="r600,radeonsi"
+- GALLIUM_DRIVERS="r600"
 - VULKAN_DRIVERS=""
 - LIBUNWIND_FLAGS="--enable-libunwind"
   addons:
@@ -400,7 +402,7 @@ matrix:
 - BUILD=make
 - MAKEFLAGS="-j4"
 - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel 
check"
-- LLVM_VERSION=6.0
+- LLVM_VERSION=7
 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
 - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl 
--with-platforms=x11,wayland"
 - DRI_DRIVERS=""
@@ -411,12 +413,13 @@ matrix:
   addons:
 apt:
   sources:
-- llvm-toolchain-trusty-6.0
-# llvm-6 requires libstdc++4.9 which is not in main repo
+- sourceline: 'deb http://apt.llvm.org/trusty/ 
llvm-toolchain-trusty-7 main'
+  key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+# llvm-7 requires libstdc++4.9 which is not in main repo
 - ubuntu-toolchain-r-test
   packages:
 # From sources above
-- llvm-6.0-dev
+- llvm-7-dev
 # Common
 - xz-utils
 - libexpat1-dev
-- 
2.19.1

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

[Mesa-dev] [PATCH] nv50/ir: silence partitionLoadStore() unused function warning

[Rhys Kidd]

Move this now-unused function into the existing comment block, which was its 
only prior use.

../../../../../src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp:2645:1:
 warning:
  unused function 'partitionLoadStore' [-Wunused-function]
partitionLoadStore(uint8_t comp[2], uint8_t size[2], uint8_t mask)

Fixes: 86e4440361 ("nouveau: codegen: Disable more old resource handling code")
Signed-off-by: Rhys Kidd 
Cc: Hans de Goede 
Cc: Samuel Pitoiset 
---
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
index 2f9bcc1f34..c6e69ff123 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
@@ -2640,7 +2640,7 @@ Converter::getResourceCoords(std::vector 
, int r, int s)
   coords[0] = mkOp1v(OP_MOV, TYPE_U32, getScratch(4, FILE_ADDRESS),
  coords[0]);
 }
-*/
+
 static inline int
 partitionLoadStore(uint8_t comp[2], uint8_t size[2], uint8_t mask)
 {
@@ -2665,7 +2665,7 @@ partitionLoadStore(uint8_t comp[2], uint8_t size[2], 
uint8_t mask)
}
return n + 1;
 }
-
+*/
 void
 Converter::getImageCoords(std::vector , int s)
 {
-- 
2.17.1

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

[Mesa-dev] [PATCH 2/2] v3d: Wire up core pipe_debug_callback

[Rhys Kidd]

Signed-off-by: Rhys Kidd 
---
 src/gallium/drivers/v3d/v3d_context.c | 13 +
 src/gallium/drivers/v3d/v3d_context.h |  1 +
 2 files changed, 14 insertions(+)

diff --git a/src/gallium/drivers/v3d/v3d_context.c 
b/src/gallium/drivers/v3d/v3d_context.c
index 2fd2fa0bbf..0737713e8b 100644
--- a/src/gallium/drivers/v3d/v3d_context.c
+++ b/src/gallium/drivers/v3d/v3d_context.c
@@ -66,6 +66,18 @@ v3d_pipe_flush(struct pipe_context *pctx, struct 
pipe_fence_handle **fence,
 }
 }
 
+static void
+v3d_set_debug_callback(struct pipe_context *pctx,
+   const struct pipe_debug_callback *cb)
+{
+struct v3d_context *v3d = v3d_context(pctx);
+
+if (cb)
+v3d->debug = *cb;
+else
+memset(>debug, 0, sizeof(v3d->debug));
+}
+
 static void
 v3d_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
 {
@@ -138,6 +150,7 @@ v3d_context_create(struct pipe_screen *pscreen, void *priv, 
unsigned flags)
 pctx->priv = priv;
 pctx->destroy = v3d_context_destroy;
 pctx->flush = v3d_pipe_flush;
+pctx->set_debug_callback = v3d_set_debug_callback;
 pctx->invalidate_resource = v3d_invalidate_resource;
 
 if (screen->devinfo.ver >= 41) {
diff --git a/src/gallium/drivers/v3d/v3d_context.h 
b/src/gallium/drivers/v3d/v3d_context.h
index f6720e2ca9..536ef61d0c 100644
--- a/src/gallium/drivers/v3d/v3d_context.h
+++ b/src/gallium/drivers/v3d/v3d_context.h
@@ -425,6 +425,7 @@ struct v3d_context {
 struct v3d_vertexbuf_stateobj vertexbuf;
 struct v3d_streamout_stateobj streamout;
 struct v3d_bo *current_oq;
+struct pipe_debug_callback debug;
 /** @} */
 };
 
-- 
2.17.1

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

[Mesa-dev] [PATCH 1/2] vc4: Wire up core pipe_debug_callback

[Rhys Kidd]

Signed-off-by: Rhys Kidd 
---
 src/gallium/drivers/vc4/vc4_context.c | 13 +
 src/gallium/drivers/vc4/vc4_context.h |  1 +
 2 files changed, 14 insertions(+)

diff --git a/src/gallium/drivers/vc4/vc4_context.c 
b/src/gallium/drivers/vc4/vc4_context.c
index 9ff39c2655..6f91d0567c 100644
--- a/src/gallium/drivers/vc4/vc4_context.c
+++ b/src/gallium/drivers/vc4/vc4_context.c
@@ -85,6 +85,18 @@ vc4_texture_barrier(struct pipe_context *pctx, unsigned 
flags)
 vc4_flush(pctx);
 }
 
+static void
+vc4_set_debug_callback(struct pipe_context *pctx,
+   const struct pipe_debug_callback *cb)
+{
+struct vc4_context *vc4 = vc4_context(pctx);
+
+if (cb)
+vc4->debug = *cb;
+else
+memset(>debug, 0, sizeof(vc4->debug));
+}
+
 static void
 vc4_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
 {
@@ -165,6 +177,7 @@ vc4_context_create(struct pipe_screen *pscreen, void *priv, 
unsigned flags)
 pctx->priv = priv;
 pctx->destroy = vc4_context_destroy;
 pctx->flush = vc4_pipe_flush;
+pctx->set_debug_callback = vc4_set_debug_callback;
 pctx->invalidate_resource = vc4_invalidate_resource;
 pctx->texture_barrier = vc4_texture_barrier;
 
diff --git a/src/gallium/drivers/vc4/vc4_context.h 
b/src/gallium/drivers/vc4/vc4_context.h
index ce8bcffac0..c162f19ba1 100644
--- a/src/gallium/drivers/vc4/vc4_context.h
+++ b/src/gallium/drivers/vc4/vc4_context.h
@@ -405,6 +405,7 @@ struct vc4_context {
 struct pipe_viewport_state viewport;
 struct vc4_constbuf_stateobj constbuf[PIPE_SHADER_TYPES];
 struct vc4_vertexbuf_stateobj vertexbuf;
+struct pipe_debug_callback debug;
 
 struct vc4_hwperfmon *perfmon;
 /** @} */
-- 
2.17.1

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

Re: [Mesa-dev] [PATCH 10/17] glsl/tests: Fix strict aliasing warning about int64/double.

[Rhys Kidd]

On 10 February 2018 at 11:33, Eric Anholt <e...@anholt.net> wrote:

> Cc: Rhys Kidd <rhysk...@gmail.com>
> Fixes: 4bf986274728 ("glsl/tests: Add UINT64 and INT64 types")
>

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>


> ---
>  .../glsl/tests/uniform_initializer_utils.cpp   | 22
> +++---
>  1 file changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/src/compiler/glsl/tests/uniform_initializer_utils.cpp
> b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
> index 701c8ef4d091..0d7fa26752fd 100644
> --- a/src/compiler/glsl/tests/uniform_initializer_utils.cpp
> +++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
> @@ -204,6 +204,22 @@ generate_array_data(void *mem_ctx, enum
> glsl_base_type base_type,
> val = new(mem_ctx) ir_constant(array_type, _for_array);
>  }
>
> +static uint64_t
> +uint64_storage(union gl_constant_value *storage)
> +{
> +   uint64_t val;
> +   memcpy(, >i, sizeof(uint64_t));
> +   return val;
> +}
> +
> +static uint64_t
> +double_storage(union gl_constant_value *storage)
> +{
> +   double val;
> +   memcpy(, >i, sizeof(double));
> +   return val;
> +}
> +
>  /**
>   * Verify that the data stored for the uniform matches the initializer
>   *
> @@ -252,13 +268,13 @@ verify_data(gl_constant_value *storage, unsigned
> storage_array_size,
> EXPECT_EQ(val->value.b[i] ? boolean_true : 0, storage[i].i);
> break;
>  case GLSL_TYPE_DOUBLE:
> -   EXPECT_EQ(val->value.d[i], *(double *)[i*2].i);
> +   EXPECT_EQ(val->value.d[i], double_storage([i*2]));
> break;
>  case GLSL_TYPE_UINT64:
> -   EXPECT_EQ(val->value.u64[i], *(uint64_t *)[i*2].i);
> +EXPECT_EQ(val->value.u64[i], uint64_storage([i*2]));
> break;
>  case GLSL_TYPE_INT64:
> -   EXPECT_EQ(val->value.i64[i], *(int64_t *)[i*2].i);
> +   EXPECT_EQ(val->value.i64[i], uint64_storage([i*2]));
> break;
>   case GLSL_TYPE_ATOMIC_UINT:
>  case GLSL_TYPE_STRUCT:
> --
> 2.15.0
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] i915: No longer rely on compatability define in intel_bufmgr.h

[Rhys Kidd]

Symbol rename from dri_* to drm_intel_* introduced a number of compatability
defines within intel_bufmgr.h.

Replace the old function with the new function, consistent with the balance
of this file.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/mesa/drivers/dri/i915/intel_regions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i915/intel_regions.c 
b/src/mesa/drivers/dri/i915/intel_regions.c
index be0dca497e..fee734801c 100644
--- a/src/mesa/drivers/dri/i915/intel_regions.c
+++ b/src/mesa/drivers/dri/i915/intel_regions.c
@@ -182,7 +182,7 @@ intel_region_alloc_for_handle(struct intel_screen *screen,
int ret;
uint32_t bit_6_swizzle, tiling;
 
-   buffer = intel_bo_gem_create_from_name(screen->bufmgr, name, handle);
+   buffer = drm_intel_bo_gem_create_from_name(screen->bufmgr, name, handle);
if (buffer == NULL)
   return NULL;
ret = drm_intel_bo_get_tiling(buffer, , _6_swizzle);
-- 
2.14.1

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

Re: [Mesa-dev] [PATCH v2 0/3] nouveau compiler warning cleanups

[Rhys Kidd]

On 29 December 2017 at 17:07, Pierre Moreau <pierre.mor...@free.fr> wrote:

> Series is
>
> Reviewed-by: Pierre Moreau <pierre.mor...@free.fr>
>

Committed to upstream master.

remote: Updating patchwork state for
https://patchwork.freedesktop.org/project/mesa/list/
remote: I: patch #191536 updated using rev
540d829d383742b9aa0d4394366d09adde31c9b5
remote: I: patch #191537 updated using rev
634ca4c2c3edf7b0a6f32d02e6a4e86316019377
remote: I: patch #193642 updated using rev
60c2d094831a2238551b6959d045638e78706924
remote: I: 3 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/mesa/mesa.git
   878bc4a5ae..60c2d09483  master -> master



>
> On 2017-12-16 — 23:00, Rhys Kidd wrote:
> > Couple of little compiler warning cleanups so that nouveau builds
> without any
> > warnings for meson's debug and release builds with gcc 7.2.0
> >
> > v2: Add preventative comment (Ilia Mirkin)
> >
> > Rhys Kidd (3):
> >   nv50: Fix unused var warning in release build
> >   nvc0: Fix unused var warnings in release build
> >   nv50/ir: Fix unused var warnings in release build
> >
> >  src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp | 2 +-
> >  src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  | 4 +++-
> >  src/gallium/drivers/nouveau/nv50/nv98_video.c | 3 ++-
> >  src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 7 ---
> >  4 files changed, 10 insertions(+), 6 deletions(-)
> >
> > --
> > 2.14.1
> >
> > ___
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v2 1/3] nv50: Fix unused var warning in release build

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/nouveau/nv50/nv98_video.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv98_video.c 
b/src/gallium/drivers/nouveau/nv50/nv98_video.c
index 92526d9f64..da0267e646 100644
--- a/src/gallium/drivers/nouveau/nv50/nv98_video.c
+++ b/src/gallium/drivers/nouveau/nv50/nv98_video.c
@@ -40,7 +40,8 @@ nv98_decoder_decode_bitstream(struct pipe_video_codec 
*decoder,
uint32_t comm_seq = ++dec->fence_seq;
union pipe_desc desc;
 
-   unsigned vp_caps, is_ref, ret;
+   unsigned vp_caps, is_ref;
+   MAYBE_UNUSED unsigned ret; /* used in debug checks */
struct nouveau_vp3_video_buffer *refs[16] = {};
 
desc.base = picture;
-- 
2.14.1

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

[Mesa-dev] [PATCH v2 0/3] nouveau compiler warning cleanups

[Rhys Kidd]

Couple of little compiler warning cleanups so that nouveau builds without any
warnings for meson's debug and release builds with gcc 7.2.0

v2: Add preventative comment (Ilia Mirkin)

Rhys Kidd (3):
  nv50: Fix unused var warning in release build
  nvc0: Fix unused var warnings in release build
  nv50/ir: Fix unused var warnings in release build

 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp | 2 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  | 4 +++-
 src/gallium/drivers/nouveau/nv50/nv98_video.c | 3 ++-
 src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 7 ---
 4 files changed, 10 insertions(+), 6 deletions(-)

-- 
2.14.1

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

[Mesa-dev] [PATCH v2 2/3] nvc0: Fix unused var warnings in release build

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c 
b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
index b5e7bba5f9..5c1cf899ca 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
@@ -32,7 +32,7 @@ nvc0_decoder_begin_frame(struct pipe_video_codec *decoder,
 {
struct nouveau_vp3_decoder *dec = (struct nouveau_vp3_decoder *)decoder;
uint32_t comm_seq = ++dec->fence_seq;
-   unsigned ret = 0;
+   MAYBE_UNUSED unsigned ret = 0; /* used in debug checks */
 
assert(dec);
assert(target);
@@ -53,7 +53,7 @@ nvc0_decoder_decode_bitstream(struct pipe_video_codec 
*decoder,
 {
struct nouveau_vp3_decoder *dec = (struct nouveau_vp3_decoder *)decoder;
uint32_t comm_seq = dec->fence_seq;
-   unsigned ret = 0;
+   MAYBE_UNUSED unsigned ret = 0; /* used in debug checks */
 
assert(decoder);
 
@@ -72,7 +72,8 @@ nvc0_decoder_end_frame(struct pipe_video_codec *decoder,
uint32_t comm_seq = dec->fence_seq;
union pipe_desc desc;
 
-   unsigned vp_caps, is_ref, ret;
+   unsigned vp_caps, is_ref;
+   MAYBE_UNUSED unsigned ret; /* used in debug checks */
struct nouveau_vp3_video_buffer *refs[16] = {};
 
desc.base = picture;
-- 
2.14.1

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

[Mesa-dev] [PATCH v2 3/3] nv50/ir: Fix unused var warnings in release build

[Rhys Kidd]

v2: Add preventative comment (Ilia Mirkin)

Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp | 2 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
index cc2a88eb40..139ff4a31d 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
@@ -621,7 +621,7 @@ void
 CodeEmitterNV50::emitLOAD(const Instruction *i)
 {
DataFile sf = i->src(0).getFile();
-   int32_t offset = i->getSrc(0)->reg.data.offset;
+   MAYBE_UNUSED int32_t offset = i->getSrc(0)->reg.data.offset;
 
switch (sf) {
case FILE_SHADER_INPUT:
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 61d4e6a2d0..0bbf21312f 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -3308,7 +3308,9 @@ PostRaLoadPropagation::handleMADforNV50(Instruction *i)
  i->setSrc(1, def->getSrc(0));
   } else {
  ImmediateValue val;
- bool ret = def->src(0).getImmediate(val);
+ // getImmediate() has side-effects on the argument so this *shouldn't*
+ // be folded into the assert()
+ MAYBE_UNUSED bool ret = def->src(0).getImmediate(val);
  assert(ret);
  if (i->getSrc(1)->reg.data.id & 1)
 val.reg.data.u32 >>= 16;
-- 
2.14.1

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

[Mesa-dev] [PATCH 0/3] nouveau compiler warning cleanups

[Rhys Kidd]

Couple of little compiler warning cleanups so that nouveau builds without any
warnings for meson's debug and release builds with gcc 7.2.0

Rhys Kidd (3):
  nv50: Fix unused var warning in release build
  nvc0: Fix unused var warnings in release build
  nv50/ir: Fix unused var warnings in release build

 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp | 2 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  | 2 +-
 src/gallium/drivers/nouveau/nv50/nv98_video.c | 3 ++-
 src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 7 ---
 4 files changed, 8 insertions(+), 6 deletions(-)

-- 
2.14.1

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

[Mesa-dev] [PATCH 1/3] nv50: Fix unused var warning in release build

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/nouveau/nv50/nv98_video.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv98_video.c 
b/src/gallium/drivers/nouveau/nv50/nv98_video.c
index 92526d9f64..da0267e646 100644
--- a/src/gallium/drivers/nouveau/nv50/nv98_video.c
+++ b/src/gallium/drivers/nouveau/nv50/nv98_video.c
@@ -40,7 +40,8 @@ nv98_decoder_decode_bitstream(struct pipe_video_codec 
*decoder,
uint32_t comm_seq = ++dec->fence_seq;
union pipe_desc desc;
 
-   unsigned vp_caps, is_ref, ret;
+   unsigned vp_caps, is_ref;
+   MAYBE_UNUSED unsigned ret; /* used in debug checks */
struct nouveau_vp3_video_buffer *refs[16] = {};
 
desc.base = picture;
-- 
2.14.1

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

[Mesa-dev] [PATCH 3/3] nv50/ir: Fix unused var warnings in release build

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp | 2 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
index cc2a88eb40..139ff4a31d 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
@@ -621,7 +621,7 @@ void
 CodeEmitterNV50::emitLOAD(const Instruction *i)
 {
DataFile sf = i->src(0).getFile();
-   int32_t offset = i->getSrc(0)->reg.data.offset;
+   MAYBE_UNUSED int32_t offset = i->getSrc(0)->reg.data.offset;
 
switch (sf) {
case FILE_SHADER_INPUT:
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 61d4e6a2d0..f49459b969 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -3308,7 +3308,7 @@ PostRaLoadPropagation::handleMADforNV50(Instruction *i)
  i->setSrc(1, def->getSrc(0));
   } else {
  ImmediateValue val;
- bool ret = def->src(0).getImmediate(val);
+ MAYBE_UNUSED bool ret = def->src(0).getImmediate(val);
  assert(ret);
  if (i->getSrc(1)->reg.data.id & 1)
 val.reg.data.u32 >>= 16;
-- 
2.14.1

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

[Mesa-dev] [PATCH 2/3] nvc0: Fix unused var warnings in release build

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c 
b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
index b5e7bba5f9..5c1cf899ca 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
@@ -32,7 +32,7 @@ nvc0_decoder_begin_frame(struct pipe_video_codec *decoder,
 {
struct nouveau_vp3_decoder *dec = (struct nouveau_vp3_decoder *)decoder;
uint32_t comm_seq = ++dec->fence_seq;
-   unsigned ret = 0;
+   MAYBE_UNUSED unsigned ret = 0; /* used in debug checks */
 
assert(dec);
assert(target);
@@ -53,7 +53,7 @@ nvc0_decoder_decode_bitstream(struct pipe_video_codec 
*decoder,
 {
struct nouveau_vp3_decoder *dec = (struct nouveau_vp3_decoder *)decoder;
uint32_t comm_seq = dec->fence_seq;
-   unsigned ret = 0;
+   MAYBE_UNUSED unsigned ret = 0; /* used in debug checks */
 
assert(decoder);
 
@@ -72,7 +72,8 @@ nvc0_decoder_end_frame(struct pipe_video_codec *decoder,
uint32_t comm_seq = dec->fence_seq;
union pipe_desc desc;
 
-   unsigned vp_caps, is_ref, ret;
+   unsigned vp_caps, is_ref;
+   MAYBE_UNUSED unsigned ret; /* used in debug checks */
struct nouveau_vp3_video_buffer *refs[16] = {};
 
desc.base = picture;
-- 
2.14.1

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

Re: [Mesa-dev] [PATCH] meson: fix egl build for meson version < 0.43

[Rhys Kidd]

On 20 October 2017 at 20:34, Dylan Baker <dy...@pnwbakers.com> wrote:

> Meson 0.43 added the ability to pass nested lists to
> include_directories, so the code that we have works for 0.43, but not
> for 0.42. This patch changes the include_directories list to be flat so
> it works with 0.42
>
> fixes: 108d257a16859898f5c ("meson: build libEGL")
> Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
> ---
>  src/egl/meson.build | 9 -
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/src/egl/meson.build b/src/egl/meson.build
> index 8ea8a5bbb69..ea7ae06761f 100644
> --- a/src/egl/meson.build
> +++ b/src/egl/meson.build
> @@ -21,7 +21,9 @@
>  c_args_for_egl = []
>  link_for_egl = []
>  deps_for_egl = []
> -incs_for_egl = []
> +incs_for_egl = [
> +  inc_include, inc_src, inc_loader, inc_gbm, include_directories('main'),
> +]
>  files_egl = files(
>'main/eglapi.c',
>'main/eglapi.h',
> @@ -159,10 +161,7 @@ libegl = shared_library(
>  '-D_EGL_BUILT_IN_DRIVER_DRI2',
>  '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_@0@'.format(egl_
> native_platform.to_upper()),
>],
> -  include_directories : [
> -incs_for_egl, inc_include, inc_src, inc_loader, inc_gbm,
> -include_directories('main'),
> -  ],
> +  include_directories : incs_for_egl,
>link_with : [link_for_egl, libloader, libxmlconfig, libglapi,
> libmesa_util],
>link_args : [ld_args_bsymbolic, ld_args_gc_sections],
>dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock,
> dep_thread],
> --
> 2.14.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] build: Fix up spirv_info.Plo

[Rhys Kidd]

On 10 August 2017 at 12:46, Emil Velikov <emil.l.veli...@gmail.com> wrote:

> Thanks Matt. Patch is:
>
> Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
>

It's a little late, but gets my:

Tested-by: Rhys Kidd <rhysk...@gmail.com>

Thanks Matt for fixing the out-of-tree builds.


>
> -Emil
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [shader-db 0/3] Small README clean ups

[Rhys Kidd]

On 24 July 2017 at 23:42, Rhys Kidd <rhysk...@gmail.com> wrote:

> Update or fix a few small items that I noticed when running through piglit
> setup on a new development environment.
>

Ah, whoops. The subject prefix for this series should be [piglit] not
[shader-db].


>
> The first two should be fairly uncontroversial.
>
> The third patch is subjective. It came about when I was running through the
> initial suggested smoke tests as-is. It was apparent there was a
> difference in
> the output format for no particular reason midway through. The change is
> not
> carried forward either past those two commands.
>
> This might be a difference without a distinction, but it draws unnececssary
> attention away when a user should be learning the principles.
>
> Rhys Kidd (3):
>   README: Update the list of test profiles
>   README: Correct typo deQP -> dEQP
>   README: Make initial smoke tests steps internally consistent
>
>  README | 40 +++-
>  1 file changed, 35 insertions(+), 5 deletions(-)
>
> --
> 2.11.0
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [shader-db 0/3] Small README clean ups

[Rhys Kidd]

Update or fix a few small items that I noticed when running through piglit
setup on a new development environment.

The first two should be fairly uncontroversial.

The third patch is subjective. It came about when I was running through the
initial suggested smoke tests as-is. It was apparent there was a difference in
the output format for no particular reason midway through. The change is not
carried forward either past those two commands.

This might be a difference without a distinction, but it draws unnececssary
attention away when a user should be learning the principles.

Rhys Kidd (3):
  README: Update the list of test profiles
  README: Correct typo deQP -> dEQP
  README: Make initial smoke tests steps internally consistent

 README | 40 +++-
 1 file changed, 35 insertions(+), 5 deletions(-)

-- 
2.11.0

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

[Mesa-dev] [shader-db 2/3] README: Correct typo deQP -> dEQP

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 README | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index cb49516b7..56ea52b62 100644
--- a/README
+++ b/README
@@ -414,13 +414,13 @@ deqp_egl.py
Support for running dEQP's EGL profile with piglit.
 
 deqp_gles2.py
-   Support for running deQP's gles2 profile with piglit.
+   Support for running dEQP's gles2 profile with piglit.
 
 deqp_gles3.py
-   Support for running deQP's gles3 profile with piglit.
+   Support for running dEQP's gles3 profile with piglit.
 
 deqp_gles31.py
-   Support for running deQP's gles3.1 profile with piglit.
+   Support for running dEQP's gles3.1 profile with piglit.
 
 deqp_vk.py
Support for running the official Khronos Vulkan CTS profile with piglit.
-- 
2.11.0

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

[Mesa-dev] [shader-db 1/3] README: Update the list of test profiles

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 README | 30 ++
 1 file changed, 30 insertions(+)

diff --git a/README b/README
index 43bdfcae7..cb49516b7 100644
--- a/README
+++ b/README
@@ -386,6 +386,9 @@ glslparser.py
 shader.py
A subset of all.py which runs only shader tests
 
+no_error.py
+   A modified version of the test list run as khr_no_error variants
+
 
 4.2 OpenCL Tests
 
@@ -407,6 +410,9 @@ xts.py
 igt.py
Support for running Intel-gpu-tools test suite using piglit.
 
+deqp_egl.py
+   Support for running dEQP's EGL profile with piglit.
+
 deqp_gles2.py
Support for running deQP's gles2 profile with piglit.
 
@@ -416,6 +422,30 @@ deqp_gles3.py
 deqp_gles31.py
Support for running deQP's gles3.1 profile with piglit.
 
+deqp_vk.py
+   Support for running the official Khronos Vulkan CTS profile with piglit.
+
+khr_gl.py
+   Support for running the open source Khronos OpenGL CTS tests with 
piglit.
+
+khr_gl45.py
+   Support for running the open source Khronos OpenGL 4.5 CTS tests with 
piglit.
+
+cts_gl.py
+   Support for running the closed source Khronos OpenGL CTS tests with 
piglit.
+
+cts_gl45.py
+   Support for running the closed source Khronos OpenGL 4.5 CTS tests with 
piglit.
+
+cts_gl.py
+   Support for running the closed source Khronos GLES CTS tests with 
piglit.
+
+oglconform.py
+   Support for running sub-test of the Intel oglconform test suite with 
piglit.
+
+es3conform.py
+   Support for running a subset of Khronos ES 3.0 Conformance suite with 
piglit.
+
 
 5. How to write tests
 -
-- 
2.11.0

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

[Mesa-dev] [shader-db 3/3] README: Make initial smoke tests steps internally consistent

[Rhys Kidd]

No other stage of the suggested initial sanity.py test or other
tests uses a folder structure with *.results.

Use a consistent naming approach throughout the initial README to
make initial setup clearer.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 56ea52b62..c6961cfac 100644
--- a/README
+++ b/README
@@ -261,12 +261,12 @@ See also section 4.
 
 To create some nice formatted test summaries, run
 
-  $ ./piglit summary html summary/sanity results/sanity.results
+  $ ./piglit summary html summary/sanity results/sanity
 
 Hint: You can combine multiple test results into a single summary.
   During development, you can use this to watch for regressions:
 
-  $ ./piglit summary html summary/compare results/baseline.results 
results/current.results
+  $ ./piglit summary html summary/compare results/baseline results/current
 
   You can combine as many testruns as you want this way (in theory;
   the HTML layout becomes awkward when the number of testruns increases)
-- 
2.11.0

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

[Mesa-dev] [PATCH] nvc0: Clean up unnecessary includes from gallium/auxiliary/vl/

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c 
b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index f2ae4f3ae3..c636926994 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -27,9 +27,6 @@
 #include "util/u_format_s3tc.h"
 #include "pipe/p_screen.h"
 
-#include "vl/vl_decoder.h"
-#include "vl/vl_video_buffer.h"
-
 #include "nouveau_vp3_video.h"
 
 #include "nvc0/nvc0_context.h"
-- 
2.11.0

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

Re: [Mesa-dev] [PATCH] u_format_test: Ignore S3TC errors.

[Rhys Kidd]

On Mon, May 22, 2017 at 1:07 PM Jose Fonseca <jfons...@vmware.com> wrote:

> This prevents spurious failures when libtxc-dxtn-s2tc is installed.
>
> Note: lp_test_format does need any change


s/does/doesn't/

With that commit message fix:

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>

since we were already ignoring
> S3TC failures there.
> ---
>  src/gallium/tests/unit/u_format_test.c | 25 +
>  1 file changed, 25 insertions(+)
>
> diff --git a/src/gallium/tests/unit/u_format_test.c
> b/src/gallium/tests/unit/u_format_test.c
> index 3145d13616..69d6c7dd3a 100644
> --- a/src/gallium/tests/unit/u_format_test.c
> +++ b/src/gallium/tests/unit/u_format_test.c
> @@ -220,6 +220,11 @@ test_format_fetch_rgba_float(const struct
> util_format_description *format_desc,
>}
> }
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, "
> obtained\n");
>print_unpacked_rgba_doubl(format_desc, "", test->unpacked,
> " expected\n");
> @@ -252,6 +257,11 @@ test_format_unpack_rgba_float(const struct
> util_format_description *format_desc,
>}
> }
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, "
> obtained\n");
>print_unpacked_rgba_doubl(format_desc, "", test->unpacked,
> " expected\n");
> @@ -302,6 +312,11 @@ test_format_pack_rgba_float(const struct
> util_format_description *format_desc,
> if (util_is_double_nan(test->unpacked[0][0][0]))
>success = TRUE;
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_packed(format_desc, "FAILED: ", packed, " obtained\n");
>print_packed(format_desc, "", test->packed, " expected\n");
> @@ -365,6 +380,11 @@ test_format_unpack_rgba_8unorm(const struct
> util_format_description *format_desc
> if (util_is_double_nan(test->unpacked[0][0][0]))
>success = TRUE;
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_8unorm(format_desc, "FAILED: ", unpacked, "
> obtained\n");
>print_unpacked_rgba_8unorm(format_desc, "", expected, "
> expected\n");
> @@ -422,6 +442,11 @@ test_format_pack_rgba_8unorm(const struct
> util_format_description *format_desc,
> if ((test->unpacked[0][0][0] * 255.0) != (int)(test->unpacked[0][0][0]
> * 255.0))
>success = TRUE;
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_packed(format_desc, "FAILED: ", packed, " obtained\n");
>print_packed(format_desc, "", test->packed, " expected\n");
> --
> 2.11.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] travis: Disable scons tests, since the gallium unit tests fail.

[Rhys Kidd]

On 21 May 2017 at 19:33, Roland Scheidegger  wrote:

> I suppose the s3tc problems should go away rather sooner than later, but
> isn't it possible to just disable the formats tests?
>

Yes, see USE_TXC_DXTN that was introduced in
29322daef2b77c4d869d2945fa1226e6b433c68
to address this issue with a small subset of the tests run by scons.

It's objective was to provide this option prior to October 2, 2017 when
this should all fall away.

Does that achieve what you are looking to do Eric?


>
> Roland
>
> Am 18.05.2017 um 23:27 schrieb Eric Anholt:
> > Every push a developer does to a travis-enabled github comes back as
> fail,
> > because the unit tests are already failing:
> >
> > Testing util_format_dxt5_rgba_pack_rgba_float ...
> >
> > FAILED: 40 bd 48 90 20 01 12 20 53 76 ab 32 00 10 15 50 obtained
> > f8 11 c5 0c 9a 73 b4 9c f6 8f ab 32 2a 9a 95 5a expected
> >
> > Testing util_format_dxt5_rgba_unpack_rgba_float ...
> >
> > FAILED: {0.549020, 1.00, 0.709804, 0.972549},
> > {0.192157, 0.33, 0.352941, 0.972549},
> > {0.549020, 1.00, 0.709804, 0.972549},
> > {0.549020, 1.00, 0.709804, 0.07},
> >
> > Disable them from CI until someone cares to fix them.
> > ---
> >  .travis.yml | 10 ++
> >  1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/.travis.yml b/.travis.yml
> > index 5e060d0335cb..20a97c013913 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -208,8 +208,9 @@ matrix:
> >  - SCONSFLAGS="-j4"
> >  # Explicitly disable.
> >  - SCONS_TARGET="llvm=0"
> > -# Keep it symmetrical to the make build.
> > -- SCONS_CHECK_COMMAND="scons llvm=0 check"
> > +# Disable scons check until the gallium unit tests pass.
> > +#- SCONS_CHECK_COMMAND="scons llvm=0 check"
> > +- SCONS_CHECK_COMMAND="true"
> >addons:
> >  apt:
> >packages:
> > @@ -225,8 +226,9 @@ matrix:
> >  - BUILD=scons
> >  - SCONSFLAGS="-j4"
> >  - SCONS_TARGET="llvm=1"
> > -# Keep it symmetrical to the make build.
> > -- SCONS_CHECK_COMMAND="scons llvm=1 check"
> > +# Disable scons check until the gallium unit tests pass.
> > +# - SCONS_CHECK_COMMAND="scons llvm=1 check"
> > +- SCONS_CHECK_COMMAND="true"
> >  - LLVM_VERSION=3.3
> >  - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
> >addons:
> >
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] vc4: Remove dead code in vc4_dump_surface_msaa()

[Rhys Kidd]

Coverity caught the use of dead code copy-paste for
found_colors[] and num_found_colors.

CID: 1341850
Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/vc4/vc4_resource.c | 6 --
 1 file changed, 6 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_resource.c 
b/src/gallium/drivers/vc4/vc4_resource.c
index 8a5398d9f7..db7faf7ce3 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -881,8 +881,6 @@ vc4_dump_surface_msaa(struct pipe_surface *psurf)
 uint32_t char_w = 140, char_h = 60;
 uint32_t char_w_per_tile = char_w / tiles_w - 1;
 uint32_t char_h_per_tile = char_h / tiles_h - 1;
-uint32_t found_colors[10];
-uint32_t num_found_colors = 0;
 
 fprintf(stderr, "Surface: %dx%d (%dx MSAA)\n",
 psurf->width, psurf->height, psurf->texture->nr_samples);
@@ -920,10 +918,6 @@ vc4_dump_surface_msaa(struct pipe_surface *psurf)
 fprintf(stderr, "-");
 fprintf(stderr, "\n");
 }
-
-for (int i = 0; i < num_found_colors; i++) {
-fprintf(stderr, "color %d: 0x%08x\n", i, found_colors[i]);
-}
 }
 
 /** Debug routine to dump the contents of an  surface to the console */
-- 
2.11.0

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

[Mesa-dev] [PATCH shader-db] Add ".so" shared objects to .gitignore

[Rhys Kidd]

For intel_stubs.so

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---

I don't have commit access, so I would appreciate a reviewer pushing this to
master.

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f69750a..95a04f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 bin
 run
+*.so
-- 
2.9.3

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

Re: [Mesa-dev] [PATCH 2/2] travis: add the txc-dxtn library so scons check can pass

[Rhys Kidd]

On 5 April 2017 at 13:27, Andres Gomez <ago...@igalia.com> wrote:

> The packaged libtxc-dxtn-s2tc0 will make scons check fail. Manually
> remove this package and install libtxc-dxtn instead.
>
> Signed-off-by: Andres Gomez <ago...@igalia.com>
> Cc: Eric Anholt <e...@anholt.net>
> Cc: Emil Velikov <emil.l.veli...@gmail.com>
>

Tested-by: Rhys Kidd <rhysk...@gmail.com>

Although let's be clear that Travis is green because of the last line in
the following from the log:

scons: Building targets ...
  Running build/linux-x86_64-debug/util/u_atomic_test ...
  Running build/linux-x86_64-debug/util/roundeven_test ...
  Running build/linux-x86_64-debug/gallium/drivers/llvmpipe/lp_test_arit ...
  Running build/linux-x86_64-debug/gallium/drivers/llvmpipe/lp_test_format
...
couldn't open libtxc_dxtn.so, software DXTn compression/decompression
unavailable


> ---
>  .travis.yml | 8 
>  1 file changed, 8 insertions(+)
>
> diff --git a/.travis.yml b/.travis.yml
> index 0667c7488d4..8b62642e616 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -25,6 +25,7 @@ env:
>global:
>  - XORG_RELEASES=http://xorg.freedesktop.org/releases/individual
>  - XCB_RELEASES=http://xcb.freedesktop.org/dist
> +- TXC_DXTN_RELEASES=https://people.freedesktop.org/~
> cbrill/libtxc_dxtn
>  - XORGMACROS_VERSION=util-macros-1.19.0
>  - GLPROTO_VERSION=glproto-1.4.17
>  - DRI2PROTO_VERSION=dri2proto-2.8
> @@ -35,6 +36,7 @@ env:
>  - XCBPROTO_VERSION=xcb-proto-1.11
>  - LIBXCB_VERSION=libxcb-1.11
>  - LIBXSHMFENCE_VERSION=libxshmfence-1.2
> +- LIBTXC_DXTN_VERSION=libtxc_dxtn-1.0.1
>  - LLVM_VERSION=3.9
>  - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
>  - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
> @@ -100,6 +102,12 @@ install:
>- tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
>- (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix &&
> make install)
>
> +  - wget $TXC_DXTN_RELEASES/$LIBTXC_DXTN_VERSION.tar.bz2
> +  - tar -jxvf $LIBTXC_DXTN_VERSION.tar.bz2
> +  - (cd $LIBTXC_DXTN_VERSION && ./configure --prefix=$HOME/prefix && make
> install)
> +
> +  - sudo apt-get purge libtxc-dxtn-s2tc0
> +
>  script:
>- if test "x$BUILD" = xmake; then
>./autogen.sh --enable-debug
> --
> 2.11.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] travis: replace Trusty-based LLVM toolchain apt-get with apt addon

[Rhys Kidd]

On 5 April 2017 at 13:27, Andres Gomez <ago...@igalia.com> wrote:

> Trusty's LLVM toochain repository was whitelisted some time ago. See:
> https://github.com/travis-ci/apt-source-whitelist/commit/
> ebc278924a0b5e282dac685683faf6a318dd424c
>
> Signed-off-by: Andres Gomez <ago...@igalia.com>
> Cc: Rhys Kidd <rhysk...@gmail.com>
> Cc: Emil Velikov <emil.l.veli...@gmail.com>
>

With the link in the commit message pointing to the Trusty change [0], this
gets my:

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>

[0]
https://github.com/travis-ci/apt-source-whitelist/commit/479067c5e74cb0c1e2419209179b1afe2edce274

---
>  .travis.yml | 15 +++
>  1 file changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 23c4bb53d75..0667c7488d4 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -9,14 +9,15 @@ cache:
>
>  addons:
>apt:
> +sources:
> +  - llvm-toolchain-trusty-3.9
>  packages:
>- libdrm-dev
>- x11proto-xf86vidmode-dev
>- libexpat1-dev
>- libxcb-dri2-0-dev
>- libx11-xcb-dev
> -  # LLVM packaging is broken and misses these dependencies
> -  - libedit-dev
> +  - llvm-3.9-dev
>- libelf-dev
>- scons
>
> @@ -35,7 +36,6 @@ env:
>  - LIBXCB_VERSION=libxcb-1.11
>  - LIBXSHMFENCE_VERSION=libxshmfence-1.2
>  - LLVM_VERSION=3.9
> -- LLVM_PACKAGE="llvm-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev"
>  - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
>  - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
>  - MAKEFLAGS=-j2
> @@ -100,15 +100,6 @@ install:
>- tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
>- (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix &&
> make install)
>
> -  # Install LLVM directly via apt-get (not Travis-CI's apt addon)
> -  # See https://github.com/travis-ci/apt-source-whitelist/pull/205#
> issuecomment-216054237
> -
> -  - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo
> apt-key add -
> -  - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty
> llvm-toolchain-trusty-3.9 main'
> -  - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty
> llvm-toolchain-trusty main'
> -  - sudo apt-get update -qq
> -  - sudo apt-get install -qq -y $LLVM_PACKAGE
> -
>  script:
>- if test "x$BUILD" = xmake; then
>./autogen.sh --enable-debug
> --
> 2.11.0
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/2] travis: add the txc-dxtn library so scons check can pass

[Rhys Kidd]

On Wed, Apr 5, 2017 at 1:49 PM Emil Velikov 
wrote:

> On 5 April 2017 at 18:27, Andres Gomez  wrote:
> > The packaged libtxc-dxtn-s2tc0 will make scons check fail. Manually
> > remove this package and install libtxc-dxtn instead.
> >
> Don't recall seeing it fail.
>
> Is that a recent thing ? Any ideas what caused it - code changes on
> our end or something to do with Travis and the LLVM introduced with
> 1/2 ?


No. From my quick review it is because the set of tests that scons runs and
the set of tests that make runs are not wholly overlapping.

scons builds have been failing for a little while due to the dxt tests.



>
> -Emil
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] travis: remove r600 as it requires llvm 3.8

[Rhys Kidd]

On 2 April 2017 at 17:26, Dave Airlie <airl...@gmail.com> wrote:

> On 3 April 2017 at 06:44, Rhys Kidd <rhysk...@gmail.com> wrote:
> > On 2 April 2017 at 08:42, Christian Gmeiner <christian.gmei...@gmail.com
> >
> > wrote:
> >>
> >> At the moment travis ci failes with the following error:
> >>
> >> checking for RADEON... yes
> >> checking for RADEON... yes
> >> configure: error: LLVM 3.8.0 or newer is required for r600
> >> make: *** No targets specified and no makefile found.  Stop.
> >>
> >> Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com>
> >
> >
> > NACK.
> >
> > I'll send out to the mailing list shortly a patch that enables LLVM 3.8+
> on
> > Travis-CI's Trusty-based environment that we use.
> >
> > Allows r600g to remain and should theoretically allow radeonsi to be
> tested
> > as well. Possibly the vulkan drivers and swr too without a great deal
> > further work.
>
> FYI, radv is llvm 3.9+.
>

Patch for radv continuous integration is on the mailing list (
https://patchwork.freedesktop.org/patch/148457/) now that all the enabling
steps including LLVM 3.9+ are in place.


>
> Dave.
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] travis: Add radv vulkan driver to continuous integration

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index aa212b1..0b03ae7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,6 +115,7 @@ script:
 --with-egl-platforms=x11,drm
 --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
 
--with-gallium-drivers=i915,nouveau,r300,r600,freedreno,svga,swrast,vc4,virgl,etnaviv,imx
+--with-vulkan-drivers=radeon
 --disable-llvm-shared-libs
 ;
   make && make check;
-- 
2.9.3

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

[Mesa-dev] [PATCH] travis: Add radeonsi to continuous integration

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index aa212b1..c0b2c1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -114,7 +114,7 @@ script:
   ./autogen.sh --enable-debug
 --with-egl-platforms=x11,drm
 --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
-
--with-gallium-drivers=i915,nouveau,r300,r600,freedreno,svga,swrast,vc4,virgl,etnaviv,imx
+
--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx
 --disable-llvm-shared-libs
 ;
   make && make check;
-- 
2.9.3

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

[Mesa-dev] [PATCH] travis: Support LLVM 3.8+ on Trusty-based Travis-CI via apt-get not apt addon

[Rhys Kidd]

Per comments by Travis-CI, the apt addon is only really needed for the
container-based Precise builds, as they don't yet support Trusty on that 
platform.

Mesa currently uses Trusty fully-virtualized environment (due to sudo: 
required).

See further:
https://docs.travis-ci.com/user/trusty-ci-environment/#Fully-virtualized-via-sudo%3A-required
https://github.com/travis-ci/apt-source-whitelist/pull/205#issuecomment-216054237

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 .travis.yml | 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3b094f..aa212b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: c
 
-sudo: true
+sudo: required
 dist: trusty
 
 cache:
@@ -15,11 +15,9 @@ addons:
   - libexpat1-dev
   - libxcb-dri2-0-dev
   - libx11-xcb-dev
-  - llvm-3.5-dev
-  # llvm-config is not in the dev package?
-  - llvm-3.5
-  # LLVM packaging is broken and misses this dep.
+  # LLVM packaging is broken and misses these dependencies
   - libedit-dev
+  - libelf-dev
   - scons
 
 env:
@@ -36,6 +34,9 @@ env:
 - XCBPROTO_VERSION=xcb-proto-1.11
 - LIBXCB_VERSION=libxcb-1.11
 - LIBXSHMFENCE_VERSION=libxshmfence-1.2
+- LLVM_VERSION=3.9
+- LLVM_PACKAGE="llvm-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev"
+- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
 - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
 - MAKEFLAGS=-j2
   matrix:
@@ -99,6 +100,15 @@ install:
   - tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
   - (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix && make 
install)
 
+  # Install LLVM directly via apt-get (not Travis-CI's apt addon)
+  # See 
https://github.com/travis-ci/apt-source-whitelist/pull/205#issuecomment-216054237
+
+  - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add 
-
+  - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty 
llvm-toolchain-trusty-3.9 main'
+  - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty 
llvm-toolchain-trusty main'
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq -y $LLVM_PACKAGE
+
 script:
   - if test "x$BUILD" = xmake; then
   ./autogen.sh --enable-debug
-- 
2.9.3

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

Re: [Mesa-dev] [PATCH] travis: remove r600 as it requires llvm 3.8

[Rhys Kidd]

On 2 April 2017 at 08:42, Christian Gmeiner 
wrote:

> At the moment travis ci failes with the following error:
>
> checking for RADEON... yes
> checking for RADEON... yes
> configure: error: LLVM 3.8.0 or newer is required for r600
> make: *** No targets specified and no makefile found.  Stop.
>
> Signed-off-by: Christian Gmeiner 
>

NACK.

I'll send out to the mailing list shortly a patch that enables LLVM 3.8+ on
Travis-CI's Trusty-based environment that we use.

Allows r600g to remain and should theoretically allow radeonsi to be tested
as well. Possibly the vulkan drivers and swr too without a great deal
further work.


> ---
>  .travis.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index a3b094f..b94d421 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -104,7 +104,7 @@ script:
>./autogen.sh --enable-debug
>  --with-egl-platforms=x11,drm
>  --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
> ---with-gallium-drivers=i915,nouveau,r300,r600,freedreno,
> svga,swrast,vc4,virgl,etnaviv,imx
> +--with-gallium-drivers=i915,nouveau,r300,freedreno,svga,
> swrast,vc4,virgl,etnaviv,imx
>  --disable-llvm-shared-libs
>  ;
>make && make check;
> --
> 2.9.3
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] travis: bring the scons build on par with AppVeyor

[Rhys Kidd]

On 16 February 2017 at 09:09, Emil Velikov <emil.l.veli...@gmail.com> wrote:

> From: Emil Velikov <emil.veli...@collabora.com>
>
> Namely, always build with LLVM and run the check target.
>
> Cc: Rhys Kidd <rhysk...@gmail.com>
> Cc: Eric Anholt <e...@anholt.net>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
>

Gets my Reviewed-by: Rhys Kidd <rhysk...@gmail.com>

I had a similar testing branch [0], and what will become apparent is there
are non-overlapping test coverage sets between $ scons check and $ make
check [1].

Might be a good task for a new developer to improve the coverage
consistency.

[0] https://github.com/Echelon9/mesa/compare/fix/scons-check
[1] https://travis-ci.org/Echelon9/mesa/jobs/191835756



> ---
>  .travis.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index fb72a5e9b9..a3b094f9a1 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -109,5 +109,5 @@ script:
>  ;
>make && make check;
>  elif test x$BUILD = xscons; then
> -  scons;
> +  scons llvm=1 && scons llvm=1 check;
>  fi
> --
> 2.11.0
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] glsl/tests: Add UINT64 and INT64 types

[Rhys Kidd]

On Mon, Feb 13, 2017 at 9:43 AM Elie Tournier <tournier.e...@gmail.com>
wrote:

> Seems good to me.
>
> Reviewed-by: Elie Tournier <tournier.e...@gmail.com>
>

Thanks Elie.

Given we are both "new-er" Mesa contributors I might wait for one more
Reviewed-by before asking for it to be merged.


> On Sat, Feb 11, 2017 at 05:31:09PM -0500, Rhys Kidd wrote:
> > glsl/tests/uniform_initializer_utils.cpp:83:14: warning: enumeration
> value ‘GLSL_TYPE_UINT64’ not handled in switch [-Wswitch]
> >switch (type->base_type) {
> >   ^
> > glsl/tests/uniform_initializer_utils.cpp:83:14: warning: enumeration
> value ‘GLSL_TYPE_INT64’ not handled in switch [-Wswitch]
> >
> > Fixes: 8ce53d4a2f3 ("glsl: Add basic ARB_gpu_shader_int64 types")
> > Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
> > ---
> >  src/compiler/glsl/tests/uniform_initializer_utils.cpp | 18
> ++
> >  1 file changed, 18 insertions(+)
> >
> > diff --git a/src/compiler/glsl/tests/uniform_initializer_utils.cpp
> b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
> > index ec64be1..2a1a168 100644
> > --- a/src/compiler/glsl/tests/uniform_initializer_utils.cpp
> > +++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
> > @@ -96,6 +96,12 @@ generate_data_element(void *mem_ctx, const glsl_type
> *type,
> >case GLSL_TYPE_DOUBLE:
> >data.d[i] = double(values[idx]);
> >break;
> > +  case GLSL_TYPE_UINT64:
> > +  data.u64[i] = (uint64_t) values[idx];
> > +  break;
> > +  case GLSL_TYPE_INT64:
> > +  data.i64[i] = (int64_t) values[idx];
> > +  break;
> >case GLSL_TYPE_ATOMIC_UINT:
> >case GLSL_TYPE_STRUCT:
> >case GLSL_TYPE_ARRAY:
> > @@ -130,6 +136,12 @@ generate_data_element(void *mem_ctx, const
> glsl_type *type,
> >case GLSL_TYPE_DOUBLE:
> >ASSERT_EQ(data.d[i], val->value.d[i]);
> >break;
> > +  case GLSL_TYPE_UINT64:
> > +  ASSERT_EQ(data.u64[i], val->value.u64[i]);
> > +  break;
> > +  case GLSL_TYPE_INT64:
> > +  ASSERT_EQ(data.i64[i], val->value.i64[i]);
> > +  break;
> >case GLSL_TYPE_ATOMIC_UINT:
> >case GLSL_TYPE_STRUCT:
> >case GLSL_TYPE_ARRAY:
> > @@ -236,6 +248,12 @@ verify_data(gl_constant_value *storage, unsigned
> storage_array_size,
> >case GLSL_TYPE_DOUBLE:
> >   EXPECT_EQ(val->value.d[i], *(double *)[i*2].i);
> >   break;
> > +  case GLSL_TYPE_UINT64:
> > + EXPECT_EQ(val->value.u64[i], *(uint64_t *)[i*2].i);
> > + break;
> > +  case GLSL_TYPE_INT64:
> > + EXPECT_EQ(val->value.i64[i], *(int64_t *)[i*2].i);
> > + break;
> >   case GLSL_TYPE_ATOMIC_UINT:
> >case GLSL_TYPE_STRUCT:
> >case GLSL_TYPE_ARRAY:
> > --
> > 2.9.3
> >
> > ___
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] glsl/tests: Add UINT64 and INT64 types

[Rhys Kidd]

glsl/tests/uniform_initializer_utils.cpp:83:14: warning: enumeration value 
‘GLSL_TYPE_UINT64’ not handled in switch [-Wswitch]
   switch (type->base_type) {
  ^
glsl/tests/uniform_initializer_utils.cpp:83:14: warning: enumeration value 
‘GLSL_TYPE_INT64’ not handled in switch [-Wswitch]

Fixes: 8ce53d4a2f3 ("glsl: Add basic ARB_gpu_shader_int64 types")
Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/compiler/glsl/tests/uniform_initializer_utils.cpp | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/src/compiler/glsl/tests/uniform_initializer_utils.cpp 
b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
index ec64be1..2a1a168 100644
--- a/src/compiler/glsl/tests/uniform_initializer_utils.cpp
+++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
@@ -96,6 +96,12 @@ generate_data_element(void *mem_ctx, const glsl_type *type,
   case GLSL_TYPE_DOUBLE:
 data.d[i] = double(values[idx]);
 break;
+  case GLSL_TYPE_UINT64:
+data.u64[i] = (uint64_t) values[idx];
+break;
+  case GLSL_TYPE_INT64:
+data.i64[i] = (int64_t) values[idx];
+break;
   case GLSL_TYPE_ATOMIC_UINT:
   case GLSL_TYPE_STRUCT:
   case GLSL_TYPE_ARRAY:
@@ -130,6 +136,12 @@ generate_data_element(void *mem_ctx, const glsl_type *type,
   case GLSL_TYPE_DOUBLE:
 ASSERT_EQ(data.d[i], val->value.d[i]);
 break;
+  case GLSL_TYPE_UINT64:
+ASSERT_EQ(data.u64[i], val->value.u64[i]);
+break;
+  case GLSL_TYPE_INT64:
+ASSERT_EQ(data.i64[i], val->value.i64[i]);
+break;
   case GLSL_TYPE_ATOMIC_UINT:
   case GLSL_TYPE_STRUCT:
   case GLSL_TYPE_ARRAY:
@@ -236,6 +248,12 @@ verify_data(gl_constant_value *storage, unsigned 
storage_array_size,
 case GLSL_TYPE_DOUBLE:
EXPECT_EQ(val->value.d[i], *(double *)[i*2].i);
break;
+case GLSL_TYPE_UINT64:
+   EXPECT_EQ(val->value.u64[i], *(uint64_t *)[i*2].i);
+   break;
+case GLSL_TYPE_INT64:
+   EXPECT_EQ(val->value.i64[i], *(int64_t *)[i*2].i);
+   break;
  case GLSL_TYPE_ATOMIC_UINT:
 case GLSL_TYPE_STRUCT:
 case GLSL_TYPE_ARRAY:
-- 
2.9.3

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

Re: [Mesa-dev] [PATCH 3/5] travis: correct libdrm required regex to also track libdrm itself

[Rhys Kidd]

On 2 February 2017 at 02:53, Andres Gomez <ago...@igalia.com> wrote:

> LGTM
>
> Reviewed-by: Andres Gomez <ago...@igalia.com>
>

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>


>
> On Wed, 2017-02-01 at 22:30 +, Emil Velikov wrote:
> > From: Emil Velikov <emil.veli...@collabora.com>
> >
> > The current regex was tracking only the libdrm_foo packages, while with
> > recent changed we bumped only (and rightfully so) libdrm.
> >
> > Fix the regex to track any libdrm package.
> >
> > Cc: Rhys Kidd <rhysk...@gmail.com>
> > Cc: Eric Anholt <e...@anholt.net>
> > Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> > ---
> >  .travis.yml | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/.travis.yml b/.travis.yml
> > index dfbc052a7d..e8426e96a2 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -47,7 +47,7 @@ install:
> >
> ># Since libdrm gets updated in configure.ac regularly, try to pick
> up the
> ># latest version from there.
> > -  - for line in `grep "^LIBDRM_.*_REQUIRED=" configure.ac`; do
> > +  - for line in `grep "^LIBDRM.*_REQUIRED=" configure.ac`; do
> >old_ver=`echo $LIBDRM_VERSION | sed 's/libdrm-//'`;
> >new_ver=`echo $line | sed 's/.*REQUIRED=//'`;
> >if `echo "$old_ver,$new_ver" | tr ',' '\n' | sort -Vc 2>
> /dev/null`; then
> --
> Br,
>
> Andres
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] etnaviv: Avoid infinite loop in find_frame()

[Rhys Kidd]

On Sun, Jan 22, 2017 at 1:49 PM Rhys Kidd <rhysk...@gmail.com> wrote:

> On 20 January 2017 at 17:06, Christian Gmeiner <
> christian.gmei...@gmail.com> wrote:
>
> Hi Rhys,
>
> 2017-01-19 7:02 GMT+01:00 Rhys Kidd <rhysk...@gmail.com>:
> > Use of unsigned loop control variable with '>= 0' would lead to infinite
> loop.
> >
> > Reported by clang:
> >
> > etnaviv_compiler.c:1024:39: warning: comparison of unsigned expression
> >= 0 is
> >   always true [-Wtautological-compare]
> >for (unsigned sp = c->frame_sp; sp >= 0; sp--)
> >~~ ^  ~
> >
> > Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
> > ---
> >  src/gallium/drivers/etnaviv/etnaviv_compiler.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > I compile tested etnaviv but have not functionally tested on real
> hardware.
> >
> > diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> > index 59e1452..f1c6787 100644
> > --- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> > +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> > @@ -1021,7 +1021,7 @@ label_mark_use(struct etna_compile *c, struct
> etna_compile_label *label)
> >  static struct etna_compile_frame *
> >  find_frame(struct etna_compile *c, enum etna_compile_frame_type type)
> >  {
> > -   for (unsigned sp = c->frame_sp; sp >= 0; sp--)
> > +   for (unsigned sp = c->frame_sp + 1; sp-- > 0 ; )
>
> looks quite ugly - I have a better and simpler fix.
>
> >if (c->frame_stack[sp].type == type)
> >   return >frame_stack[sp];
> >
> > --
> > 2.9.3
> >
>
> 8<---
>
> Subject: [PATCH] etnaviv: Avoid infinite loop in find_frame()
>
> Use of unsigned loop control variable with '>= 0' would lead to infinite
> loop.
>
> Reported by clang:
>
> etnaviv_compiler.c:1024:39: warning: comparison of unsigned expression
> >= 0 is always true [-Wtautological-compare]
>for (unsigned sp = c->frame_sp; sp >= 0; sp--)
>~~ ^  ~
>
> v2: Simply use the same datatype as c->frame_sp is using.
>
> Reported-by: Rhys Kidd <rhysk...@gmail.com>
> Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com>
> ---
>  src/gallium/drivers/etnaviv/etnaviv_compiler.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> index 59e1452..dc9af57 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> @@ -1021,7 +1021,7 @@ label_mark_use(struct etna_compile *c, struct
> etna_compile_label *label)
>  static struct etna_compile_frame *
>  find_frame(struct etna_compile *c, enum etna_compile_frame_type type)
>  {
> -   for (unsigned sp = c->frame_sp; sp >= 0; sp--)
> +   for (int sp = c->frame_sp; sp >= 0; sp--)
>if (c->frame_stack[sp].type == type)
>   return >frame_stack[sp];
>
> --
> 2.9.3
> 8<---
>
> If you are okay with that I will push it in the next days.
>
>
> Reviewed-by: Rhys Kidd <rhysk...@gmail.com>
>

Hello Christian,

I don't think this change made it to master as yet.

Regards,
Rhys


>
> greets
> --
> Christian Gmeiner, MSc
>
> https://www.youtube.com/user/AloryOFFICIAL
> https://soundcloud.com/christian-gmeiner
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] etnaviv: Avoid infinite loop in find_frame()

[Rhys Kidd]

On 20 January 2017 at 17:06, Christian Gmeiner <christian.gmei...@gmail.com>
wrote:

> Hi Rhys,
>
> 2017-01-19 7:02 GMT+01:00 Rhys Kidd <rhysk...@gmail.com>:
> > Use of unsigned loop control variable with '>= 0' would lead to infinite
> loop.
> >
> > Reported by clang:
> >
> > etnaviv_compiler.c:1024:39: warning: comparison of unsigned expression
> >= 0 is
> >   always true [-Wtautological-compare]
> >for (unsigned sp = c->frame_sp; sp >= 0; sp--)
> >~~ ^  ~
> >
> > Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
> > ---
> >  src/gallium/drivers/etnaviv/etnaviv_compiler.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > I compile tested etnaviv but have not functionally tested on real
> hardware.
> >
> > diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> > index 59e1452..f1c6787 100644
> > --- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> > +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> > @@ -1021,7 +1021,7 @@ label_mark_use(struct etna_compile *c, struct
> etna_compile_label *label)
> >  static struct etna_compile_frame *
> >  find_frame(struct etna_compile *c, enum etna_compile_frame_type type)
> >  {
> > -   for (unsigned sp = c->frame_sp; sp >= 0; sp--)
> > +   for (unsigned sp = c->frame_sp + 1; sp-- > 0 ; )
>
> looks quite ugly - I have a better and simpler fix.
>
> >if (c->frame_stack[sp].type == type)
> >   return >frame_stack[sp];
> >
> > --
> > 2.9.3
> >
>
> 8<---
>
> Subject: [PATCH] etnaviv: Avoid infinite loop in find_frame()
>
> Use of unsigned loop control variable with '>= 0' would lead to infinite
> loop.
>
> Reported by clang:
>
> etnaviv_compiler.c:1024:39: warning: comparison of unsigned expression
> >= 0 is always true [-Wtautological-compare]
>for (unsigned sp = c->frame_sp; sp >= 0; sp--)
>~~ ^  ~
>
> v2: Simply use the same datatype as c->frame_sp is using.
>
> Reported-by: Rhys Kidd <rhysk...@gmail.com>
> Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com>
> ---
>  src/gallium/drivers/etnaviv/etnaviv_compiler.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> index 59e1452..dc9af57 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
> @@ -1021,7 +1021,7 @@ label_mark_use(struct etna_compile *c, struct
> etna_compile_label *label)
>  static struct etna_compile_frame *
>  find_frame(struct etna_compile *c, enum etna_compile_frame_type type)
>  {
> -   for (unsigned sp = c->frame_sp; sp >= 0; sp--)
> +   for (int sp = c->frame_sp; sp >= 0; sp--)
>if (c->frame_stack[sp].type == type)
>   return >frame_stack[sp];
>
> --
> 2.9.3
> 8<---
>
> If you are okay with that I will push it in the next days.
>
>
Reviewed-by: Rhys Kidd <rhysk...@gmail.com>


> greets
> --
> Christian Gmeiner, MSc
>
> https://www.youtube.com/user/AloryOFFICIAL
> https://soundcloud.com/christian-gmeiner
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] etnaviv: Avoid infinite loop in find_frame()

[Rhys Kidd]

Use of unsigned loop control variable with '>= 0' would lead to infinite loop.

Reported by clang:

etnaviv_compiler.c:1024:39: warning: comparison of unsigned expression >= 0 is
  always true [-Wtautological-compare]
   for (unsigned sp = c->frame_sp; sp >= 0; sp--)
   ~~ ^  ~

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/etnaviv/etnaviv_compiler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I compile tested etnaviv but have not functionally tested on real hardware.

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c 
b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
index 59e1452..f1c6787 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
@@ -1021,7 +1021,7 @@ label_mark_use(struct etna_compile *c, struct 
etna_compile_label *label)
 static struct etna_compile_frame *
 find_frame(struct etna_compile *c, enum etna_compile_frame_type type)
 {
-   for (unsigned sp = c->frame_sp; sp >= 0; sp--)
+   for (unsigned sp = c->frame_sp + 1; sp-- > 0 ; )
   if (c->frame_stack[sp].type == type)
  return >frame_stack[sp];
 
-- 
2.9.3

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

Re: [Mesa-dev] [PATCH] travis: Add the new drivers etnaviv and imx

[Rhys Kidd]

On 13 January 2017 at 02:05, Christian Gmeiner <christian.gmei...@gmail.com>
wrote:

> 2017-01-13 5:06 GMT+01:00 Rhys Kidd <rhysk...@gmail.com>:
> > Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
> > ---
> >  .travis.yml | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/.travis.yml b/.travis.yml
> > index 3d107aa..dfbc052 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -32,7 +32,7 @@ env:
> >  - DRI3PROTO_VERSION=dri3proto-1.0
> >  - PRESENTPROTO_VERSION=presentproto-1.0
> >  - LIBPCIACCESS_VERSION=libpciaccess-0.13.4
> > -- LIBDRM_VERSION=libdrm-2.4.65
> > +- LIBDRM_VERSION=libdrm-2.4.74
> >  - XCBPROTO_VERSION=xcb-proto-1.11
> >  - LIBXCB_VERSION=libxcb-1.11
> >  - LIBXSHMFENCE_VERSION=libxshmfence-1.2
> > @@ -92,7 +92,7 @@ install:
> >
> >- wget http://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
> >- tar -jxvf $LIBDRM_VERSION.tar.bz2
> > -  - (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix
> --enable-vc4 && make install)
> > +  - (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix
> --enable-vc4 --enable-etnaviv-experimental-api && make install)
> >
> >- wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
> >- tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
> > @@ -103,7 +103,7 @@ script:
> >./autogen.sh --enable-debug
> >  --with-egl-platforms=x11,drm
> >  --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
> > ---with-gallium-drivers=svga,swrast,vc4,virgl,r300,r600
> > +--with-gallium-drivers=svga,swrast,vc4,virgl,r300,r600,
> etnaviv,imx
> >  --disable-llvm-shared-libs
> >  ;
> >make && make check;
> > --
> > 2.9.3
> >
>
> Reviewed-by: Christian Gmeiner <christian.gmei...@gmail.com>
>
>
Thank you. Could you please push to master, as I don't have commit access.


> greets
> --
> Christian Gmeiner, MSc
>
> https://www.youtube.com/user/AloryOFFICIAL
> https://soundcloud.com/christian-gmeiner
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] travis: Add the new drivers etnaviv and imx

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3d107aa..dfbc052 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ env:
 - DRI3PROTO_VERSION=dri3proto-1.0
 - PRESENTPROTO_VERSION=presentproto-1.0
 - LIBPCIACCESS_VERSION=libpciaccess-0.13.4
-- LIBDRM_VERSION=libdrm-2.4.65
+- LIBDRM_VERSION=libdrm-2.4.74
 - XCBPROTO_VERSION=xcb-proto-1.11
 - LIBXCB_VERSION=libxcb-1.11
 - LIBXSHMFENCE_VERSION=libxshmfence-1.2
@@ -92,7 +92,7 @@ install:
 
   - wget http://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
   - tar -jxvf $LIBDRM_VERSION.tar.bz2
-  - (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix --enable-vc4 && 
make install)
+  - (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix --enable-vc4 
--enable-etnaviv-experimental-api && make install)
 
   - wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
   - tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
@@ -103,7 +103,7 @@ script:
   ./autogen.sh --enable-debug
 --with-egl-platforms=x11,drm
 --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
---with-gallium-drivers=svga,swrast,vc4,virgl,r300,r600
+--with-gallium-drivers=svga,swrast,vc4,virgl,r300,r600,etnaviv,imx
 --disable-llvm-shared-libs
 ;
   make && make check;
-- 
2.9.3

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

Re: [Mesa-dev] [PATCH v2] glsl: Add pthread libs to cache_test

[Rhys Kidd]

On 26 October 2016 at 00:47, Timothy Arceri <timothy.arc...@collabora.com>
wrote:

> Reviewed-by: Timothy Arceri <timothy.arc...@collabora.com>
>
> I guess you don't have commit access?
>

I do not have commit access, so would appreciate if you could please push
to master.


>
> On Wed, 2016-10-26 at 00:13 -0400, Rhys Kidd wrote:
> > Fixes the following compile error, present when the SHA1 library is
> > libgcrypt:
> >
> >   CCLD glsl/tests/cache-test
> > glsl/.libs/libglsl.a(libmesautil_la-mesa-sha1.o): In function
> > `call_once':
> > /mesa/src/util/../../include/c11/threads_posix.h:96: undefined
> > reference to `pthread_once'
> >
> > Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
> > ---
> > v2:
> >  Add additional comment to the commit message (Timothy Arceri)
> >
> >  src/compiler/Makefile.glsl.am | 5 -
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/compiler/Makefile.glsl.am
> > b/src/compiler/Makefile.glsl.am
> > index 80dfb73..15bea6b 100644
> > --- a/src/compiler/Makefile.glsl.am
> > +++ b/src/compiler/Makefile.glsl.am
> > @@ -62,8 +62,11 @@ glsl_tests_blob_test_LDADD =
> >   \
> >
> >  glsl_tests_cache_test_SOURCES =  \
> >   glsl/tests/cache_test.c
> > +glsl_tests_cache_test_CFLAGS =   \
> > + $(PTHREAD_CFLAGS)
> >  glsl_tests_cache_test_LDADD =\
> > - glsl/libglsl.la
> > + glsl/libglsl.la \
> > + $(PTHREAD_LIBS)
> >
> >  glsl_tests_general_ir_test_SOURCES = \
> >   glsl/tests/builtin_variable_test.cpp\
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v2] glsl: Add pthread libs to cache_test

[Rhys Kidd]

Fixes the following compile error, present when the SHA1 library is libgcrypt:

  CCLD glsl/tests/cache-test
glsl/.libs/libglsl.a(libmesautil_la-mesa-sha1.o): In function `call_once':
/mesa/src/util/../../include/c11/threads_posix.h:96: undefined reference to 
`pthread_once'

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
v2:
 Add additional comment to the commit message (Timothy Arceri)

 src/compiler/Makefile.glsl.am | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index 80dfb73..15bea6b 100644
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -62,8 +62,11 @@ glsl_tests_blob_test_LDADD = \
 
 glsl_tests_cache_test_SOURCES =\
glsl/tests/cache_test.c
+glsl_tests_cache_test_CFLAGS = \
+   $(PTHREAD_CFLAGS)
 glsl_tests_cache_test_LDADD =  \
-   glsl/libglsl.la
+   glsl/libglsl.la \
+   $(PTHREAD_LIBS)
 
 glsl_tests_general_ir_test_SOURCES =   \
glsl/tests/builtin_variable_test.cpp\
-- 
2.9.3

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

[Mesa-dev] [PATCH] glsl: Add pthread libs to cache_test

[Rhys Kidd]

Fixes the following compile error:

  CCLD glsl/tests/cache-test
glsl/.libs/libglsl.a(libmesautil_la-mesa-sha1.o): In function `call_once':
/mesa/src/util/../../include/c11/threads_posix.h:96: undefined reference to 
`pthread_once'

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/compiler/Makefile.glsl.am | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index 80dfb73..15bea6b 100644
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -62,8 +62,11 @@ glsl_tests_blob_test_LDADD = \
 
 glsl_tests_cache_test_SOURCES =\
glsl/tests/cache_test.c
+glsl_tests_cache_test_CFLAGS = \
+   $(PTHREAD_CFLAGS)
 glsl_tests_cache_test_LDADD =  \
-   glsl/libglsl.la
+   glsl/libglsl.la \
+   $(PTHREAD_LIBS)
 
 glsl_tests_general_ir_test_SOURCES =   \
glsl/tests/builtin_variable_test.cpp\
-- 
2.9.3

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

Re: [Mesa-dev] [PATCH] vulkan: Initial partial documentation for Vulkan internals.

[Rhys Kidd]

On 14 October 2016 at 10:36,  wrote:

> From: Kevin Rogovin 
>
> A main page ala Doxygen together with a Doxygen file added.
> In addition, documentation for portions of anv_private.h:
>  - placing portions into doxygen groups
>  - some cross linking doxygen style to other files
>

Hello Kevin,

Thanks for the initial steps to document anv.

Can I make two suggestions:
1. Split out into two patches: (a) adding of inline comments to .c/.h
files; and (b) the doxygen plumbing.
2. In relation to the doxygen plumbing you can leverage the existing
($top_dir)/doxygen/ to reduce your patch size.

Suggest that you look at how i965.doxy and common.doxy interact.


>
> Signed-off-by: Kevin Rogovin 
> ---
>  src/intel/genxml/gen_macros.h   |4 +-
>  src/intel/vulkan/anv_allocator.c|5 +-
>  src/intel/vulkan/anv_private.h  |  287 +++-
>  src/intel/vulkan/docs/.gitignore|1 +
>  src/intel/vulkan/docs/Doxyfile  | 2483
> +++
>  src/intel/vulkan/docs/intel_vulkan.doxy |   86 ++
>  6 files changed, 2845 insertions(+), 21 deletions(-)
>  create mode 100644 src/intel/vulkan/docs/.gitignore
>  create mode 100644 src/intel/vulkan/docs/Doxyfile
>  create mode 100644 src/intel/vulkan/docs/intel_vulkan.doxy
>




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

Re: [Mesa-dev] Proposal: move the Mesa documentation to readthedocs.org

[Rhys Kidd]

On 27 August 2016 at 01:09, Nicholas Bishop  wrote:

> Hi,
>
> I'd like to propose a conversion of Mesa's documentation to
> reStructuredText (RST) and hosting the result on readthedocs.org. The
> intent is to make Mesa's documentation more accessible, searchable, and
> easier to edit.
>
> I put together a quick proof-of-concept here:
>
> http://mesa-docs.readthedocs.io/en/latest/intro.html
>
> (For comparison: http://mesa3d.org/intro.html)
>
> Readthedocs.org essentially renders either Markdown or RST from a git
> repository (or other VCS) into a nice pretty set of HTML pages. (I'm more
> familiar with Markdown than RST, but I saw the Gallium docs are already
> using RST on readthedocs.org.)
>
> Putting the content in RST and on readthedocs.org makes formatting and
> searching easy, and it's a familiar platform for many developers.
>
> For the linked proof-of-concept I used pandoc (http://pandoc.org/) to
> convert all the HTML pages to RST, on top of which I did some minor editing
> to make the table of contents look reasonable. It's by no means a finished
> conversion, but I hope having something to look at can make discussion
> easier. This is all just a few hours work, but of course proofing and
> correcting all the text/formatting would take somewhat longer.
>
> Here's the git repo that readthedocs.org is pulling from:
> https://github.com/nicholasbishop/mesa-docs/tree/master/docs
>
> Thoughts?
>

Hello Nicholas,

Although not a core Mesa developer, I have recently done work on Mesa
documentation.

So FWIW, in my view this is a worthwhile objective to work towards
readthedocs.org formatted documentation. It is clear and well presented. We
also have precedence within this project for using that service, for the
Gallium docs in RST.

Worth considering however:

1. How can we minimize the effort of maintaining two repositories? (I don't
think anyone here would support dropping the HTML docs, as they feed into
the main Mesa website).
2. How easy it is to automate the additional tweaks you mention? Scriptable?

Rhys


>
> -Nicholas
>
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/2] r600g: Clean up defined magic numbers for TGSI opcodes

[Rhys Kidd]

On Monday, August 29, 2016, Marek Olšák <mar...@gmail.com> wrote:

> For the series:
>
> Reviewed-by: Marek Olšák <marek.ol...@amd.com <javascript:;>>
>
> Marek


Thanks Marek.

As I don't have commit access, when you have a moment I would appreciate if
you could please push to master.

Regards,
Rhys


>
> On Sat, Aug 27, 2016 at 6:05 PM, Rhys Kidd <rhysk...@gmail.com
> <javascript:;>> wrote:
> > Small code clean up that removes magic numbers where a TGSI
> > opcode has been defined.
> >
> > No functional change expected as each opcode is unsupported on
> > the respective hardware.
> >
> > Signed-off-by: Rhys Kidd <rhysk...@gmail.com <javascript:;>>
> > ---
> >  src/gallium/drivers/r600/r600_shader.c | 14 +++---
> >  src/gallium/include/pipe/p_shader_tokens.h |  1 +
> >  2 files changed, 8 insertions(+), 7 deletions(-)
> >
> > diff --git a/src/gallium/drivers/r600/r600_shader.c
> b/src/gallium/drivers/r600/r600_shader.c
> > index a39301f..f7b8495 100644
> > --- a/src/gallium/drivers/r600/r600_shader.c
> > +++ b/src/gallium/drivers/r600/r600_shader.c
> > @@ -8998,20 +8998,20 @@ static const struct r600_shader_tgsi_instruction
> r600_shader_tgsi_instruction[]
> > [TGSI_OPCODE_ENDSUB]= { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_TXQ_LZ]= { FETCH_OP_GET_TEXTURE_RESINFO,
> tgsi_tex},
> > [TGSI_OPCODE_TXQS]  = { FETCH_OP_GET_NUMBER_OF_SAMPLES,
> tgsi_tex},
> > -   [105]   = { ALU_OP0_NOP, tgsi_unsupported},
> > +   [TGSI_OPCODE_RESQ]  = { ALU_OP0_NOP, tgsi_unsupported},
> > [106]   = { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_NOP]   = { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_FSEQ]  = { ALU_OP2_SETE_DX10, tgsi_op2},
> > [TGSI_OPCODE_FSGE]  = { ALU_OP2_SETGE_DX10, tgsi_op2},
> > [TGSI_OPCODE_FSLT]  = { ALU_OP2_SETGT_DX10, tgsi_op2_swap},
> > [TGSI_OPCODE_FSNE]  = { ALU_OP2_SETNE_DX10, tgsi_op2_swap},
> > -   [112]   = { ALU_OP0_NOP, tgsi_unsupported},
> > +   [TGSI_OPCODE_MEMBAR]= { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_CALLNZ]= { ALU_OP0_NOP, tgsi_unsupported},
> > [114]   = { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP, tgsi_loop_breakc},
> > [TGSI_OPCODE_KILL_IF]   = { ALU_OP2_KILLGT, tgsi_kill},  /*
> conditional kill */
> > [TGSI_OPCODE_END]   = { ALU_OP0_NOP, tgsi_end},  /* aka HALT
> */
> > -   [118]   = { ALU_OP0_NOP, tgsi_unsupported},
> > +   [TGSI_OPCODE_DFMA]  = { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_F2I]   = { ALU_OP1_FLT_TO_INT, tgsi_op2_trans},
> > [TGSI_OPCODE_IDIV]  = { ALU_OP0_NOP, tgsi_idiv},
> > [TGSI_OPCODE_IMAX]  = { ALU_OP2_MAX_INT, tgsi_op2},
> > @@ -9197,14 +9197,14 @@ static const struct r600_shader_tgsi_instruction
> eg_shader_tgsi_instruction[] =
> > [TGSI_OPCODE_ENDSUB]= { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_TXQ_LZ]= { FETCH_OP_GET_TEXTURE_RESINFO,
> tgsi_tex},
> > [TGSI_OPCODE_TXQS]  = { FETCH_OP_GET_NUMBER_OF_SAMPLES,
> tgsi_tex},
> > -   [105]   = { ALU_OP0_NOP, tgsi_unsupported},
> > +   [TGSI_OPCODE_RESQ]  = { ALU_OP0_NOP, tgsi_unsupported},
> > [106]   = { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_NOP]   = { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_FSEQ]  = { ALU_OP2_SETE_DX10, tgsi_op2},
> > [TGSI_OPCODE_FSGE]  = { ALU_OP2_SETGE_DX10, tgsi_op2},
> > [TGSI_OPCODE_FSLT]  = { ALU_OP2_SETGT_DX10, tgsi_op2_swap},
> > [TGSI_OPCODE_FSNE]  = { ALU_OP2_SETNE_DX10, tgsi_op2_swap},
> > -   [112]   = { ALU_OP0_NOP, tgsi_unsupported},
> > +   [TGSI_OPCODE_MEMBAR]= { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_CALLNZ]= { ALU_OP0_NOP, tgsi_unsupported},
> > [114]   = { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP, tgsi_unsupported},
> > @@ -9420,14 +9420,14 @@ static const struct r600_shader_tgsi_instruction
> cm_shader_tgsi_instruction[] =
> > [TGSI_OPCODE_ENDSUB]= { ALU_OP0_NOP, tgsi_unsupported},
> > [TGSI_OPCODE_TXQ_LZ]= { FETCH_OP_GET_TEXTURE_RESINFO,
> tgsi_tex},
> > [TGSI_OPCODE_TXQS]  = { FETCH_OP_GET_NUMBER_OF_SAMPLES,
> t

Re: [Mesa-dev] [PATCH 0/2] r600g: Pair of small code clean ups with TGSI

[Rhys Kidd]

On Monday, August 29, 2016, James Harvey <lothmor...@gmail.com> wrote:

> Hi Rhys,
>
>  I ran piglit on my Evergreen HD5850 with your patches.
>
> No regressions here.
>
> Tested-by: James Harvey <lothmor...@gmail.com>


Thanks James.


>
> Thanks,
> James
>
>
> On 08/27/2016 09:05 AM, Rhys Kidd wrote:
>
>> Having run Mesa through Clang on Eric Anholt's Travis harness, these small
>> code clean ups improve readability of TGSI code in r600g and may avoid
>> future problems.
>>
>> Series also can be found at:
>> https://github.com/Echelon9/mesa/tree/fix/r600g-cleanup-tgsi-opcodes
>>
>> I don't have the hardware to test this so would appreciated Tested-by's.
>>
>> I do not have commit rights to fd.o so after R-B would appreciate if
>> the reviewer(s) could push to master.
>>
>> Rhys Kidd (2):
>>   r600g: Avoid duplicated initialization of TGSI_OPCODE_DFMA
>>   r600g: Clean up defined magic numbers for TGSI opcodes
>>
>>  src/gallium/drivers/r600/r600_shader.c | 18 +-
>>  src/gallium/include/pipe/p_shader_tokens.h |  1 +
>>  2 files changed, 10 insertions(+), 9 deletions(-)
>>
>>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] r600g: Avoid duplicated initialization of TGSI_OPCODE_DFMA

[Rhys Kidd]

On Saturday, August 27, 2016, Jan Vesely <jan.ves...@rutgers.edu> wrote:

> On Sat, 2016-08-27 at 12:05 -0400, Rhys Kidd wrote:
> > As reported by Clang, TGSI_OPCODE_DFMA (defined magic number 118) is
> > currently initialized twice for Cayman and Evergreen.
> > When Jan Vesely added double precision FMA opcode it did make sense
> > to locate it immediately after TGSI_OPCODE_DMAD, although this is
> > out of order.
> >
> > This change cleans up the prior magic number definition and ensures
> > any later reordering of this struct will not create problems.
> >
> > Prior change was:
> >
> >   commit 015e2e0fce3eea7884f8df275c2fadc35143a324
> >   Author: Jan Vesely <jan.ves...@rutgers.edu <javascript:;>>
> >   Date:   Sat Jul 2 16:14:54 2016 -0400
> >
> >   r600g: Add double precision FMA ops
> >
> >   Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96782
> >   Fixes: 54c4d525da7c7fc1e103d7a3e6db015abb132d5d ("r600g: Enable
> > FMA on chips that support it")
> >
> >   Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu <javascript:;>>
> >   Tested-by: James Harvey <lothmor...@gmail.com <javascript:;>>
> >   Signed-off-by: Marek Olšák <marek.ol...@amd.com <javascript:;>>
> >
> > Signed-off-by: Rhys Kidd <rhysk...@gmail.com <javascript:;>>
>
> So much for using magic numbers.
> Reviewed-by: Jan Vesely <jan.ves...@rutgers.edu <javascript:;>>
>
> thanks,
> Jan


Thanks for reviewing Jan.


>
> > ---
> >  src/gallium/drivers/r600/r600_shader.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/gallium/drivers/r600/r600_shader.c
> > b/src/gallium/drivers/r600/r600_shader.c
> > index 64aacca..a39301f 100644
> > --- a/src/gallium/drivers/r600/r600_shader.c
> > +++ b/src/gallium/drivers/r600/r600_shader.c
> > @@ -9210,7 +9210,7 @@ static const struct
> > r600_shader_tgsi_instruction eg_shader_tgsi_instruction[] =
> >   [TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP,
> > tgsi_unsupported},
> >   [TGSI_OPCODE_KILL_IF]   = { ALU_OP2_KILLGT,
> > tgsi_kill},  /* conditional kill */
> >   [TGSI_OPCODE_END]   = { ALU_OP0_NOP, tgsi_end},  /* aka
> > HALT */
> > - [118]   = { ALU_OP0_NOP,
> > tgsi_unsupported},
> > + /* Refer below for TGSI_OPCODE_DFMA */
> >   [TGSI_OPCODE_F2I]   = { ALU_OP1_FLT_TO_INT, tgsi_f2i},
> >   [TGSI_OPCODE_IDIV]  = { ALU_OP0_NOP, tgsi_idiv},
> >   [TGSI_OPCODE_IMAX]  = { ALU_OP2_MAX_INT, tgsi_op2},
> > @@ -9433,7 +9433,7 @@ static const struct
> > r600_shader_tgsi_instruction cm_shader_tgsi_instruction[] =
> >   [TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP,
> > tgsi_unsupported},
> >   [TGSI_OPCODE_KILL_IF]   = { ALU_OP2_KILLGT,
> > tgsi_kill},  /* conditional kill */
> >   [TGSI_OPCODE_END]   = { ALU_OP0_NOP, tgsi_end},  /* aka
> > HALT */
> > - [118]   = { ALU_OP0_NOP,
> > tgsi_unsupported},
> > + /* Refer below for TGSI_OPCODE_DFMA */
> >   [TGSI_OPCODE_F2I]   = { ALU_OP1_FLT_TO_INT, tgsi_op2},
> >   [TGSI_OPCODE_IDIV]  = { ALU_OP0_NOP, tgsi_idiv},
> >   [TGSI_OPCODE_IMAX]  = { ALU_OP2_MAX_INT, tgsi_op2},
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 0/2] r600g: Pair of small code clean ups with TGSI

[Rhys Kidd]

Having run Mesa through Clang on Eric Anholt's Travis harness, these small
code clean ups improve readability of TGSI code in r600g and may avoid
future problems.

Series also can be found at:
https://github.com/Echelon9/mesa/tree/fix/r600g-cleanup-tgsi-opcodes

I don't have the hardware to test this so would appreciated Tested-by's.

I do not have commit rights to fd.o so after R-B would appreciate if
the reviewer(s) could push to master.

Rhys Kidd (2):
  r600g: Avoid duplicated initialization of TGSI_OPCODE_DFMA
  r600g: Clean up defined magic numbers for TGSI opcodes

 src/gallium/drivers/r600/r600_shader.c | 18 +-
 src/gallium/include/pipe/p_shader_tokens.h |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

-- 
2.7.4

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

[Mesa-dev] [PATCH 1/2] r600g: Avoid duplicated initialization of TGSI_OPCODE_DFMA

[Rhys Kidd]

As reported by Clang, TGSI_OPCODE_DFMA (defined magic number 118) is
currently initialized twice for Cayman and Evergreen.

When Jan Vesely added double precision FMA opcode it did make sense
to locate it immediately after TGSI_OPCODE_DMAD, although this is
out of order.

This change cleans up the prior magic number definition and ensures
any later reordering of this struct will not create problems.

Prior change was:

  commit 015e2e0fce3eea7884f8df275c2fadc35143a324
  Author: Jan Vesely <jan.ves...@rutgers.edu>
  Date:   Sat Jul 2 16:14:54 2016 -0400

  r600g: Add double precision FMA ops

  Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96782
  Fixes: 54c4d525da7c7fc1e103d7a3e6db015abb132d5d ("r600g: Enable FMA on 
chips that support it")

  Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu>
  Tested-by: James Harvey <lothmor...@gmail.com>
  Signed-off-by: Marek Olšák <marek.ol...@amd.com>

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/r600/r600_shader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c 
b/src/gallium/drivers/r600/r600_shader.c
index 64aacca..a39301f 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -9210,7 +9210,7 @@ static const struct r600_shader_tgsi_instruction 
eg_shader_tgsi_instruction[] =
[TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_KILL_IF]   = { ALU_OP2_KILLGT, tgsi_kill},  /* conditional 
kill */
[TGSI_OPCODE_END]   = { ALU_OP0_NOP, tgsi_end},  /* aka HALT */
-   [118]   = { ALU_OP0_NOP, tgsi_unsupported},
+   /* Refer below for TGSI_OPCODE_DFMA */
[TGSI_OPCODE_F2I]   = { ALU_OP1_FLT_TO_INT, tgsi_f2i},
[TGSI_OPCODE_IDIV]  = { ALU_OP0_NOP, tgsi_idiv},
[TGSI_OPCODE_IMAX]  = { ALU_OP2_MAX_INT, tgsi_op2},
@@ -9433,7 +9433,7 @@ static const struct r600_shader_tgsi_instruction 
cm_shader_tgsi_instruction[] =
[TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_KILL_IF]   = { ALU_OP2_KILLGT, tgsi_kill},  /* conditional 
kill */
[TGSI_OPCODE_END]   = { ALU_OP0_NOP, tgsi_end},  /* aka HALT */
-   [118]   = { ALU_OP0_NOP, tgsi_unsupported},
+   /* Refer below for TGSI_OPCODE_DFMA */
[TGSI_OPCODE_F2I]   = { ALU_OP1_FLT_TO_INT, tgsi_op2},
[TGSI_OPCODE_IDIV]  = { ALU_OP0_NOP, tgsi_idiv},
[TGSI_OPCODE_IMAX]  = { ALU_OP2_MAX_INT, tgsi_op2},
-- 
2.7.4

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

[Mesa-dev] [PATCH 2/2] r600g: Clean up defined magic numbers for TGSI opcodes

[Rhys Kidd]

Small code clean up that removes magic numbers where a TGSI
opcode has been defined.

No functional change expected as each opcode is unsupported on
the respective hardware.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/r600/r600_shader.c | 14 +++---
 src/gallium/include/pipe/p_shader_tokens.h |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c 
b/src/gallium/drivers/r600/r600_shader.c
index a39301f..f7b8495 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -8998,20 +8998,20 @@ static const struct r600_shader_tgsi_instruction 
r600_shader_tgsi_instruction[]
[TGSI_OPCODE_ENDSUB]= { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_TXQ_LZ]= { FETCH_OP_GET_TEXTURE_RESINFO, tgsi_tex},
[TGSI_OPCODE_TXQS]  = { FETCH_OP_GET_NUMBER_OF_SAMPLES, tgsi_tex},
-   [105]   = { ALU_OP0_NOP, tgsi_unsupported},
+   [TGSI_OPCODE_RESQ]  = { ALU_OP0_NOP, tgsi_unsupported},
[106]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_NOP]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_FSEQ]  = { ALU_OP2_SETE_DX10, tgsi_op2},
[TGSI_OPCODE_FSGE]  = { ALU_OP2_SETGE_DX10, tgsi_op2},
[TGSI_OPCODE_FSLT]  = { ALU_OP2_SETGT_DX10, tgsi_op2_swap},
[TGSI_OPCODE_FSNE]  = { ALU_OP2_SETNE_DX10, tgsi_op2_swap},
-   [112]   = { ALU_OP0_NOP, tgsi_unsupported},
+   [TGSI_OPCODE_MEMBAR]= { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_CALLNZ]= { ALU_OP0_NOP, tgsi_unsupported},
[114]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP, tgsi_loop_breakc},
[TGSI_OPCODE_KILL_IF]   = { ALU_OP2_KILLGT, tgsi_kill},  /* conditional 
kill */
[TGSI_OPCODE_END]   = { ALU_OP0_NOP, tgsi_end},  /* aka HALT */
-   [118]   = { ALU_OP0_NOP, tgsi_unsupported},
+   [TGSI_OPCODE_DFMA]  = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_F2I]   = { ALU_OP1_FLT_TO_INT, tgsi_op2_trans},
[TGSI_OPCODE_IDIV]  = { ALU_OP0_NOP, tgsi_idiv},
[TGSI_OPCODE_IMAX]  = { ALU_OP2_MAX_INT, tgsi_op2},
@@ -9197,14 +9197,14 @@ static const struct r600_shader_tgsi_instruction 
eg_shader_tgsi_instruction[] =
[TGSI_OPCODE_ENDSUB]= { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_TXQ_LZ]= { FETCH_OP_GET_TEXTURE_RESINFO, tgsi_tex},
[TGSI_OPCODE_TXQS]  = { FETCH_OP_GET_NUMBER_OF_SAMPLES, tgsi_tex},
-   [105]   = { ALU_OP0_NOP, tgsi_unsupported},
+   [TGSI_OPCODE_RESQ]  = { ALU_OP0_NOP, tgsi_unsupported},
[106]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_NOP]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_FSEQ]  = { ALU_OP2_SETE_DX10, tgsi_op2},
[TGSI_OPCODE_FSGE]  = { ALU_OP2_SETGE_DX10, tgsi_op2},
[TGSI_OPCODE_FSLT]  = { ALU_OP2_SETGT_DX10, tgsi_op2_swap},
[TGSI_OPCODE_FSNE]  = { ALU_OP2_SETNE_DX10, tgsi_op2_swap},
-   [112]   = { ALU_OP0_NOP, tgsi_unsupported},
+   [TGSI_OPCODE_MEMBAR]= { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_CALLNZ]= { ALU_OP0_NOP, tgsi_unsupported},
[114]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP, tgsi_unsupported},
@@ -9420,14 +9420,14 @@ static const struct r600_shader_tgsi_instruction 
cm_shader_tgsi_instruction[] =
[TGSI_OPCODE_ENDSUB]= { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_TXQ_LZ]= { FETCH_OP_GET_TEXTURE_RESINFO, tgsi_tex},
[TGSI_OPCODE_TXQS]  = { FETCH_OP_GET_NUMBER_OF_SAMPLES, tgsi_tex},
-   [105]   = { ALU_OP0_NOP, tgsi_unsupported},
+   [TGSI_OPCODE_RESQ]  = { ALU_OP0_NOP, tgsi_unsupported},
[106]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_NOP]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_FSEQ]  = { ALU_OP2_SETE_DX10, tgsi_op2},
[TGSI_OPCODE_FSGE]  = { ALU_OP2_SETGE_DX10, tgsi_op2},
[TGSI_OPCODE_FSLT]  = { ALU_OP2_SETGT_DX10, tgsi_op2_swap},
[TGSI_OPCODE_FSNE]  = { ALU_OP2_SETNE_DX10, tgsi_op2_swap},
-   [112]   = { ALU_OP0_NOP, tgsi_unsupported},
+   [TGSI_OPCODE_MEMBAR]= { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_CALLNZ]= { ALU_OP0_NOP, tgsi_unsupported},
[114]   = { ALU_OP0_NOP, tgsi_unsupported},
[TGSI_OPCODE_BREAKC]= { ALU_OP0_NOP, tgsi_unsupported},
diff --git a/src/gallium/include/pipe/p_shader_tokens.h 
b/src/gallium/include/pipe/p_shader_tokens.h
index 7621ab9..39ce9ea 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ 

[Mesa-dev] [PATCH] gallium/ttn: Remove duplicated TGSI_OPCODE_DP2A initialization

[Rhys Kidd]

Duplicate line is currently on 1535.

Identified by Clang, when run through Eric Anholt's Travis harness.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/auxiliary/nir/tgsi_to_nir.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c 
b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 906c643..7f5774d 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -1575,7 +1575,6 @@ static const nir_op op_trans[TGSI_OPCODE_LAST] = {
[TGSI_OPCODE_TXB] = 0,
[TGSI_OPCODE_DIV] = nir_op_fdiv,
[TGSI_OPCODE_DP2] = 0,
-   [TGSI_OPCODE_DP2A] = 0,
[TGSI_OPCODE_TXL] = 0,
 
[TGSI_OPCODE_BRK] = 0,
-- 
2.7.4

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

Re: [Mesa-dev] [PATCH 0/4] Travis CI build fixes

[Rhys Kidd]

On 18 August 2016 at 18:28, Eric Anholt <e...@anholt.net> wrote:

> Here are a few fixes to get Travis CI builds on github working again.
>
> As a reminder: If your personal branches of Mesa are on github, you
> can enable it in your github account, then go to travis-ci.com, login,
> go to your profile settings there, and check the Mesa repository.  Any
> further git pushes will get a make check and a scons bulid run on
> them, across a variety of drivers.
>
> Eric Anholt (4):
>   travis: Parse configure.ac to pick an updated LIBDRM_VERSION.
>   travis: Update to the Ubuntu Trusty image.
>   travis: Enable vc4 in libdrm to satisfy vc4 test build dependency.
>   travis: Upgrade LLVM dependency to 3.5 and enable LLVM drivers.
>
>  .travis.yml | 28 
>  1 file changed, 20 insertions(+), 8 deletions(-)
>
> --
> 2.8.1
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>


The series gets my

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] egl/dri2: dri2_make_current: Make sure display is initialized before using it

[Rhys Kidd]

Whilst I don't know that code as well as I'd like. It does get my

Tested-by: Rhys Kidd <rhysk...@gmail.com>

for fixing that piglit on i965 ILK. Thanks for the two patches!

On 15 July 2016 at 04:28, Nicolas Boichat <drink...@chromium.org> wrote:

> android.opengl.cts.WrapperTest#testGetIntegerv1 CTS test calls
> eglTerminate, followed by eglReleaseThread. In that case, the
> display will not be initialized when eglReleaseThread calls
> MakeCurrent with NULL parameters, to unbind the context, which
> causes a a segfault in drv->API.MakeCurrent (dri2_make_current),
> either in glFlush or in a latter call.
>
> A similar case is observed in this bug:
> https://bugs.freedesktop.org/show_bug.cgi?id=69622, where the test
> call eglTerminate, then eglMakeCurrent(dpy, NULL, NULL, NULL).
>
> This patch:
>  1. Validates that the display is initialized, if ctx/dsurf/rsurf
> are not all NULL.
>  2. Does not call glFlush/unBindContext is there is no display.
>  3. However, it still goes through the normal path as
> drv->API.DestroyContext decrements the reference count on the
> context, and frees the structure.
>
> Cc: "11.2 12.0" <mesa-sta...@lists.freedesktop.org>
> Signed-off-by: Nicolas Boichat <drink...@chromium.org>
> ---
>
> I did not actually test the case reported on the bug, only the CTS
> test, would be nice if someone can try it out (Rhys? Chad?).
>
> Applies after "egl/dri2: dri2_make_current: Set EGL error if bindContext
> fails", but wanted to keep the 2 patches separate as they are different
> problems and discussions.
>
>  src/egl/drivers/dri2/egl_dri2.c | 13 ++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/src/egl/drivers/dri2/egl_dri2.c
> b/src/egl/drivers/dri2/egl_dri2.c
> index 2e97d85..3269e52 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -1166,7 +1166,8 @@ dri2_destroy_context(_EGLDriver *drv, _EGLDisplay
> *disp, _EGLContext *ctx)
> struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
>
> if (_eglPutContext(ctx)) {
> -  dri2_dpy->core->destroyContext(dri2_ctx->dri_context);
> +  if (dri2_dpy)
> + dri2_dpy->core->destroyContext(dri2_ctx->dri_context);
>free(dri2_ctx);
> }
>
> @@ -1189,6 +1190,10 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay
> *disp, _EGLSurface *dsurf,
> __DRIdrawable *ddraw, *rdraw;
> __DRIcontext *cctx;
>
> +   /* Check that the display is initialized */
> +   if ((ctx != NULL || dsurf != NULL || rsurf != NULL) && !dri2_dpy)
> +  return _eglError(EGL_NOT_INITIALIZED, "eglMakeCurrent error");
> +
> /* make new bindings */
> if (!_eglBindContext(ctx, dsurf, rsurf, _ctx, _dsurf,
> _rsurf)) {
>/* _eglBindContext already sets the EGL error (in
> _eglCheckMakeCurrent) */
> @@ -1196,14 +1201,14 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay
> *disp, _EGLSurface *dsurf,
> }
>
> /* flush before context switch */
> -   if (old_ctx && dri2_drv->glFlush)
> +   if (old_ctx && dri2_dpy && dri2_drv->glFlush)
>dri2_drv->glFlush();
>
> ddraw = (dsurf) ? dri2_dpy->vtbl->get_dri_drawable(dsurf) : NULL;
> rdraw = (rsurf) ? dri2_dpy->vtbl->get_dri_drawable(rsurf) : NULL;
> cctx = (dri2_ctx) ? dri2_ctx->dri_context : NULL;
>
> -   if (old_ctx) {
> +   if (old_ctx && dri2_dpy) {
>__DRIcontext *old_cctx = dri2_egl_context(old_ctx)->dri_context;
>dri2_dpy->core->unbindContext(old_cctx);
> }
> @@ -1292,6 +1297,8 @@ static EGLBoolean
>  dri2_destroy_surface(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf)
>  {
> struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
> +   if (!dri2_dpy)
> +  return EGL_TRUE;
> return dri2_dpy->vtbl->destroy_surface(drv, dpy, surf);
>  }
>
> --
> 2.8.0.rc3.226.g39d4020
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] i965/gen4: Pull texture formats from the texture object not the miptree

[Rhys Kidd]

On 22 June 2016 at 15:07, Jason Ekstrand <ja...@jlekstrand.net> wrote:

> This makes texture views sort-of work.  It doesn't add full texture view
> support for gen4-5 but it is enough to fix the GL_ARB_copy_image formats
> piglit test on Iron Lake.
>
> Signed-off-by: Jason Ekstrand <ja...@jlekstrand.net>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83036
> Cc: "11.1 11.2 12.0" <mesa-sta...@lists.freedesktop.org>
> ---
>  src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +-
>  1 file changed, 1 insertion(+), 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 133a944..b07bf19 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> @@ -335,7 +335,7 @@ brw_update_texture_surface(struct gl_context *ctx,
> surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE,
>   6 * 4, 32, surf_offset);
>
> -   uint32_t tex_format = translate_tex_format(brw, mt->format,
> +   uint32_t tex_format = translate_tex_format(brw, intelObj->_Format,
>sampler->sRGBDecode);
>
> if (tObj->Target == GL_TEXTURE_EXTERNAL_OES) {
>
>
For what it is worth, this series is:

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>
Tested-by: Rhys Kidd <rhysk...@gmail.com>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [GSoC lib soft float] Blog update

[Rhys Kidd]

On Monday, June 13, 2016, tournier.elie  wrote:

> Hi,
>
> After a few weeks of coding, I wrote a new post on my blog (
> https://hopetech.github.io/). I speak about the progress of my project,
> the difficulties encountered and the tools I use.
>
> Happy reading,
> Elie
>

Hello Elie,

Thanks for the short write up on progress so far.

Whilst not going to the technical elements, I encourage you to continue
with your project and look forward to reviewing patches.

Perhaps you could also consider how the documentation might be improved in
the areas you found lacking?

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

Re: [Mesa-dev] [PATCH] vc4: Fix failed instruction path of QIR validate pass

[Rhys Kidd]

On 19 May 2016 at 23:17, Rhys Kidd <rhysk...@gmail.com> wrote:

> Correct use of qir_dump_inst() within QIR validate pass.
>
> Reported by the following GCC warning:
>
> mesa/src/gallium/drivers/vc4/vc4_qir_validate.c: In function 'fail_instr':
> mesa/src/gallium/drivers/vc4/vc4_qir_validate.c:31:23: warning: passing
> argument 1 of 'qir_dump_inst' from incompatible pointer type
>  qir_dump_inst(stderr, inst);
>^
> In file included from mesa/src/gallium/drivers/vc4/vc4_qir_validate.c:24:0:
> mesa/src/gallium/drivers/vc4/vc4_qir.h:489:6: note: expected 'struct
> vc4_compile *' but argument is of type 'struct _IO_FILE *'
>  void qir_dump_inst(struct vc4_compile *c, struct qinst *inst);
>   ^
>
> Introduced in 8e2d0843c02daf5280184f179ae8ed440ac90d7f.
>
> Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
> ---
>  src/gallium/drivers/vc4/vc4_qir_validate.c | 20 ++--
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/src/gallium/drivers/vc4/vc4_qir_validate.c
> b/src/gallium/drivers/vc4/vc4_qir_validate.c
> index af2e3ba..da6457c 100644
> --- a/src/gallium/drivers/vc4/vc4_qir_validate.c
> +++ b/src/gallium/drivers/vc4/vc4_qir_validate.c
> @@ -25,10 +25,10 @@
>  #include "vc4_qpu.h"
>
>  static void
> -fail_instr(struct qinst *inst, const char *msg)
> +fail_instr(struct vc4_compile *c, struct qinst *inst, const char *msg)
>  {
>  fprintf(stderr, "qir_validate: %s: ", msg);
> -qir_dump_inst(stderr, inst);
> +qir_dump_inst(c, inst);
>  fprintf(stderr, "\n");
>  abort();
>  }
> @@ -50,18 +50,18 @@ void qir_validate(struct vc4_compile *c)
>  struct qinst *def = c->defs[i];
>
>  if (def && def->cond != QPU_COND_ALWAYS)
> -fail_instr(def, "SSA def with condition");
> +fail_instr(c, def, "SSA def with condition");
>  }
>
>  list_for_each_entry(struct qinst, inst, >instructions, link) {
>  switch (inst->dst.file) {
>  case QFILE_TEMP:
>  if (inst->dst.index >= c->num_temps)
> -fail_instr(inst, "bad temp index");
> +fail_instr(c, inst, "bad temp index");
>
>  if (c->defs[inst->dst.index] &&
>  already_assigned[inst->dst.index]) {
> -fail_instr(inst, "Re-assignment of SSA
> value");
> +fail_instr(c, inst, "Re-assignment of SSA
> value");
>  }
>  already_assigned[inst->dst.index] = true;
>  break;
> @@ -81,7 +81,7 @@ void qir_validate(struct vc4_compile *c)
>  case QFILE_FRAG_REV_FLAG:
>  case QFILE_SMALL_IMM:
>  case QFILE_LOAD_IMM:
> -fail_instr(inst, "Bad dest file");
> +fail_instr(c, inst, "Bad dest file");
>  break;
>  }
>
> @@ -91,7 +91,7 @@ void qir_validate(struct vc4_compile *c)
>  switch (src.file) {
>  case QFILE_TEMP:
>  if (src.index >= c->num_temps)
> -fail_instr(inst, "bad temp
> index");
> +fail_instr(c, inst, "bad temp
> index");
>  break;
>
>  case QFILE_VARY:
> @@ -102,14 +102,14 @@ void qir_validate(struct vc4_compile *c)
>
>  case QFILE_SMALL_IMM:
>  if (qpu_encode_small_immediate(src.index)
> == ~0)
> -fail_instr(inst, "bad small
> immediate");
> +fail_instr(c, inst, "bad small
> immediate");
>  break;
>
>  case QFILE_FRAG_X:
>  case QFILE_FRAG_Y:
>  case QFILE_FRAG_REV_FLAG:
>  if (c->stage != QSTAGE_FRAG)
> -fail_instr(inst, "frag access in
> VS/CS");
> +fail_instr(c, inst, "frag access
> in VS/CS");
>  

[Mesa-dev] [PATCH 2/2] vc4: Fix doxygen warnings

[Rhys Kidd]

Now that vc4 automated code documentation can be generated with
doxygen, fix the warnings issued by Doxygen 1.8.11.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/vc4/vc4_qir_schedule.c | 4 ++--
 src/gallium/drivers/vc4/vc4_tiling.c   | 8 
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_qir_schedule.c 
b/src/gallium/drivers/vc4/vc4_qir_schedule.c
index 8b843a3..4a1283c 100644
--- a/src/gallium/drivers/vc4/vc4_qir_schedule.c
+++ b/src/gallium/drivers/vc4/vc4_qir_schedule.c
@@ -80,8 +80,8 @@ struct schedule_state {
 enum direction { F, R };
 
 /**
- * Marks a dependency between two intructions, that @after must appear after
- * @before.
+ * Marks a dependency between two intructions, that \p after must appear after
+ * \p before.
  *
  * Our dependencies are tracked as a DAG.  Since we're scheduling bottom-up,
  * the latest instructions with nothing left to schedule are the DAG heads,
diff --git a/src/gallium/drivers/vc4/vc4_tiling.c 
b/src/gallium/drivers/vc4/vc4_tiling.c
index 2a803ab..4bcb85b 100644
--- a/src/gallium/drivers/vc4/vc4_tiling.c
+++ b/src/gallium/drivers/vc4/vc4_tiling.c
@@ -269,8 +269,8 @@ vc4_store_t_image(void *dst, uint32_t dst_stride,
 }
 
 /**
- * Loads pixel data from the start (microtile-aligned) box in @src to the
- * start of @dst according to the given tiling format.
+ * Loads pixel data from the start (microtile-aligned) box in \p src to the
+ * start of \p dst according to the given tiling format.
  */
 void
 vc4_load_tiled_image(void *dst, uint32_t dst_stride,
@@ -293,8 +293,8 @@ vc4_load_tiled_image(void *dst, uint32_t dst_stride,
 }
 
 /**
- * Stores pixel data from the start of @src into a (microtile-aligned) box in
- * @dst according to the given tiling format.
+ * Stores pixel data from the start of \p src into a (microtile-aligned) box in
+ * \p dst according to the given tiling format.
  */
 void
 vc4_store_tiled_image(void *dst, uint32_t dst_stride,
-- 
2.7.4

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

[Mesa-dev] [PATCH 0/2] vc4: Add automated code documentation

[Rhys Kidd]

Simple patchset to provide doxygen-based automated code documentation of the
vc4 driver for developers.

By plumbing this through we get the same for all Gallium-based drivers for free.

Post review I will need someone with Mesa commit access to push these for me. 

Rhys Kidd (2):
  doxygen: Plumb through gallium/ to automated documentation
  vc4: Fix doxygen warnings

 doxygen/Makefile   | 3 ++-
 src/gallium/drivers/vc4/vc4_qir_schedule.c | 4 ++--
 src/gallium/drivers/vc4/vc4_tiling.c   | 8 
 3 files changed, 8 insertions(+), 7 deletions(-)

-- 
2.7.4

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

[Mesa-dev] [PATCH 1/2] doxygen: Plumb through gallium/ to automated documentation

[Rhys Kidd]

Add Gallium and the Gallium-based drivers to doxygen's automated
code documentation infrastructure.

Can be individually created with:

  cd $MESA_TOP_LEVEL/
  make -C doxygen/ gallium.tag

Benefits from the existing doxygen Makefile runners to clean up
afterwards with 'make clean'.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doxygen/Makefile b/doxygen/Makefile
index 6685b99..e5fac32 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -25,7 +25,8 @@ full: $(FULL:.doxy=.tag)
 
 SUBSET = \
main.doxy \
-   math.doxy
+   math.doxy \
+   gallium.doxy
 
 subset: $(SUBSET:.doxy=.tag)
$(foreach FILE,$(SUBSET),doxygen $(FILE);)
-- 
2.7.4

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

Re: [Mesa-dev] [PATCH v2] doxygen: Add missing modules to Windows runner

[Rhys Kidd]

On 11 May 2016 at 07:51, Rhys Kidd <rhysk...@gmail.com> wrote:

> On 10 May 2016 at 16:04, Elie TOURNIER <tournier.e...@gmail.com> wrote:
>
>> ---
>>  doxygen/doxy.bat | 7 +++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/doxygen/doxy.bat b/doxygen/doxy.bat
>> index e566ca3..408964e 100644
>> --- a/doxygen/doxy.bat
>> +++ b/doxygen/doxy.bat
>> @@ -6,6 +6,9 @@ doxygen swrast_setup.doxy
>>  doxygen tnl.doxy
>>  doxygen core.doxy
>>  doxygen glapi.doxy
>> +doxygen glsl.doxy
>> +doxygen nir.doxy
>> +doxygen i965.doxy
>>
>>  echo Building again, to resolve tags
>>  doxygen tnl_dd.doxy
>> @@ -14,4 +17,8 @@ doxygen math.doxy
>>  doxygen swrast.doxy
>>  doxygen swrast_setup.doxy
>>  doxygen tnl.doxy
>> +doxygen core.doxy
>>  doxygen glapi.doxy
>> +doxygen glsl.doxy
>> +doxygen nir.doxy
>> +doxygen i965.doxy
>> --
>> 1.9.1
>>
>>
> Hello Elie,
>
> I think you meant to sign off your patch (passing the '-s' or '--signoff'
> parameter to git format-patch). Shouldn't be a need to send a v3 for this
> patch as you did do so on your v1. Whomever pushes the patch can add that
> for you I'd expect.
>
> Whilst I don't have a Windows development environment to test this on it
> looks sensible so gets my:
> Acked-by: Rhys Kidd <rhysk...@gmail.com>
>
> Thanks for the patch!
>

Looks like this patch was never committed.

Given neither myself nor Elie have Mesa commit rights, can we kindly
request another (Emil?) to commit pre the upcoming freeze?

I think my Acked-by is the strongest review this simple patch is likely to
get.

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

[Mesa-dev] [PATCH] vc4: Fix failed instruction path of QIR validate pass

[Rhys Kidd]

Correct use of qir_dump_inst() within QIR validate pass.

Reported by the following GCC warning:

mesa/src/gallium/drivers/vc4/vc4_qir_validate.c: In function 'fail_instr':
mesa/src/gallium/drivers/vc4/vc4_qir_validate.c:31:23: warning: passing 
argument 1 of 'qir_dump_inst' from incompatible pointer type
 qir_dump_inst(stderr, inst);
   ^
In file included from mesa/src/gallium/drivers/vc4/vc4_qir_validate.c:24:0:
mesa/src/gallium/drivers/vc4/vc4_qir.h:489:6: note: expected 'struct 
vc4_compile *' but argument is of type 'struct _IO_FILE *'
 void qir_dump_inst(struct vc4_compile *c, struct qinst *inst);
  ^

Introduced in 8e2d0843c02daf5280184f179ae8ed440ac90d7f.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/gallium/drivers/vc4/vc4_qir_validate.c | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_qir_validate.c 
b/src/gallium/drivers/vc4/vc4_qir_validate.c
index af2e3ba..da6457c 100644
--- a/src/gallium/drivers/vc4/vc4_qir_validate.c
+++ b/src/gallium/drivers/vc4/vc4_qir_validate.c
@@ -25,10 +25,10 @@
 #include "vc4_qpu.h"
 
 static void
-fail_instr(struct qinst *inst, const char *msg)
+fail_instr(struct vc4_compile *c, struct qinst *inst, const char *msg)
 {
 fprintf(stderr, "qir_validate: %s: ", msg);
-qir_dump_inst(stderr, inst);
+qir_dump_inst(c, inst);
 fprintf(stderr, "\n");
 abort();
 }
@@ -50,18 +50,18 @@ void qir_validate(struct vc4_compile *c)
 struct qinst *def = c->defs[i];
 
 if (def && def->cond != QPU_COND_ALWAYS)
-fail_instr(def, "SSA def with condition");
+fail_instr(c, def, "SSA def with condition");
 }
 
 list_for_each_entry(struct qinst, inst, >instructions, link) {
 switch (inst->dst.file) {
 case QFILE_TEMP:
 if (inst->dst.index >= c->num_temps)
-fail_instr(inst, "bad temp index");
+fail_instr(c, inst, "bad temp index");
 
 if (c->defs[inst->dst.index] &&
 already_assigned[inst->dst.index]) {
-fail_instr(inst, "Re-assignment of SSA value");
+fail_instr(c, inst, "Re-assignment of SSA 
value");
 }
 already_assigned[inst->dst.index] = true;
 break;
@@ -81,7 +81,7 @@ void qir_validate(struct vc4_compile *c)
 case QFILE_FRAG_REV_FLAG:
 case QFILE_SMALL_IMM:
 case QFILE_LOAD_IMM:
-fail_instr(inst, "Bad dest file");
+fail_instr(c, inst, "Bad dest file");
 break;
 }
 
@@ -91,7 +91,7 @@ void qir_validate(struct vc4_compile *c)
 switch (src.file) {
 case QFILE_TEMP:
 if (src.index >= c->num_temps)
-fail_instr(inst, "bad temp index");
+fail_instr(c, inst, "bad temp index");
 break;
 
 case QFILE_VARY:
@@ -102,14 +102,14 @@ void qir_validate(struct vc4_compile *c)
 
 case QFILE_SMALL_IMM:
 if (qpu_encode_small_immediate(src.index) == 
~0)
-fail_instr(inst, "bad small 
immediate");
+fail_instr(c, inst, "bad small 
immediate");
 break;
 
 case QFILE_FRAG_X:
 case QFILE_FRAG_Y:
 case QFILE_FRAG_REV_FLAG:
 if (c->stage != QSTAGE_FRAG)
-fail_instr(inst, "frag access in 
VS/CS");
+fail_instr(c, inst, "frag access in 
VS/CS");
 break;
 
 case QFILE_NULL:
@@ -117,7 +117,7 @@ void qir_validate(struct vc4_compile *c)
 case QFILE_TLB_COLOR_WRITE_MS:
 case QFILE_TLB_Z_WRITE:
 case QFILE_TLB_STENCIL_SETUP:
-fail_instr(inst, "Bad src file");
+fail_instr(c, inst, "Bad src file");
 break;
 }
 }
-- 
2.7.4

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

Re: [Mesa-dev] [PATCH v2] doxygen: Add missing modules to Windows runner

[Rhys Kidd]

On 10 May 2016 at 16:04, Elie TOURNIER <tournier.e...@gmail.com> wrote:

> ---
>  doxygen/doxy.bat | 7 +++
>  1 file changed, 7 insertions(+)
>
> diff --git a/doxygen/doxy.bat b/doxygen/doxy.bat
> index e566ca3..408964e 100644
> --- a/doxygen/doxy.bat
> +++ b/doxygen/doxy.bat
> @@ -6,6 +6,9 @@ doxygen swrast_setup.doxy
>  doxygen tnl.doxy
>  doxygen core.doxy
>  doxygen glapi.doxy
> +doxygen glsl.doxy
> +doxygen nir.doxy
> +doxygen i965.doxy
>
>  echo Building again, to resolve tags
>  doxygen tnl_dd.doxy
> @@ -14,4 +17,8 @@ doxygen math.doxy
>  doxygen swrast.doxy
>  doxygen swrast_setup.doxy
>  doxygen tnl.doxy
> +doxygen core.doxy
>  doxygen glapi.doxy
> +doxygen glsl.doxy
> +doxygen nir.doxy
> +doxygen i965.doxy
> --
> 1.9.1
>
>
Hello Elie,

I think you meant to sign off your patch (passing the '-s' or '--signoff'
parameter to git format-patch). Shouldn't be a need to send a v3 for this
patch as you did do so on your v1. Whomever pushes the patch can add that
for you I'd expect.

Whilst I don't have a Windows development environment to test this on it
looks sensible so gets my:
Acked-by: Rhys Kidd <rhysk...@gmail.com>

Thanks for the patch!
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] i965: Reduce the SIMD8 GS push constant threshold from 32 to 24.

[Rhys Kidd]

Hello Kenneth,

On 10 May 2016 at 03:46, Kenneth Graunke  wrote:

> Three Shadow of Mordor geometry shaders increase by a single
> instruction, but the number of spills/fills in Orbital Explorer
> is reduced from 194:1279 -> 82:454.  No other programs are affected.
>
> Signed-off-by: Kenneth Graunke 
> ---
>  src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp
> b/src/mesa/drivers/dri/i965/brw_fs.cpp
> index ce3e00b..332e382 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
> @@ -5155,7 +5155,7 @@ fs_visitor::setup_gs_payload()
> }
>
> /* Use a maximum of 32 registers for push-model inputs. */
>

Can you please update this comment for the changed number of registers?


> -   const unsigned max_push_components = 32;
> +   const unsigned max_push_components = 24;
>
>
/* If pushing our inputs would take too many registers, reduce the URB
> read
>  * length (which is in HWords, or 8 registers), and resort to pulling.
> --
> 2.8.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] Update Doxygen for Windows users

[Rhys Kidd]

On 20 April 2016 at 01:46, Elie TOURNIER  wrote:

> Now Windows users have the same doxygen files than *nix users
> Not tested (I don't have a windows)
>
> Signed-off-by: Elie TOURNIER 
> ---
>  doxygen/doxy.bat | 7 +++
>  1 file changed, 7 insertions(+)
>
> diff --git a/doxygen/doxy.bat b/doxygen/doxy.bat
> index e566ca3..408964e 100644
> --- a/doxygen/doxy.bat
> +++ b/doxygen/doxy.bat
> @@ -6,6 +6,9 @@ doxygen swrast_setup.doxy
>  doxygen tnl.doxy
>  doxygen core.doxy
>  doxygen glapi.doxy
> +doxygen glsl.doxy
> +doxygen nir.doxy
> +doxygen i965.doxy
>
>  echo Building again, to resolve tags
>  doxygen tnl_dd.doxy
> @@ -14,4 +17,8 @@ doxygen math.doxy
>  doxygen swrast.doxy
>  doxygen swrast_setup.doxy
>  doxygen tnl.doxy
> +doxygen core.doxy
>  doxygen glapi.doxy
> +doxygen glsl.doxy
> +doxygen nir.doxy
> +doxygen i965.doxy
> --
> 1.9.1
>
>
First word of the first line of the git comment should identify the Mesa
sub system.

I'd suggest something like "doxygen: Add missing modules to Windows runner".
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] glsl: Update hash table comments in constant propagation

[Rhys Kidd]

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 src/compiler/glsl/opt_constant_propagation.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/glsl/opt_constant_propagation.cpp 
b/src/compiler/glsl/opt_constant_propagation.cpp
index 416ba16..4764d16 100644
--- a/src/compiler/glsl/opt_constant_propagation.cpp
+++ b/src/compiler/glsl/opt_constant_propagation.cpp
@@ -122,7 +122,7 @@ public:
exec_list *acp;
 
/**
-* List of kill_entry: The masks of variables whose values were
+* Hash table of kill_entry: The masks of variables whose values were
 * killed in this block.
 */
hash_table *kills;
@@ -454,7 +454,7 @@ ir_constant_propagation_visitor::kill(ir_variable *var, 
unsigned write_mask)
   }
}
 
-   /* Add this writemask of the variable to the list of killed
+   /* Add this writemask of the variable to the hash table of killed
 * variables in this block.
 */
hash_entry *kill_hash_entry = _mesa_hash_table_search(this->kills, var);
@@ -463,7 +463,7 @@ ir_constant_propagation_visitor::kill(ir_variable *var, 
unsigned write_mask)
   entry->write_mask |= write_mask;
   return;
}
-   /* Not already in the list.  Make new entry. */
+   /* Not already in the hash table.  Make new entry. */
_mesa_hash_table_insert(this->kills, var,
new(this->mem_ctx) kill_entry(var, write_mask));
 }
-- 
2.5.0

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

[Mesa-dev] [PATCH 8/9] doxygen: Fix typo in doxygen/tnl.doxy

[Rhys Kidd]

TAGFILE relative folder should match .tag file

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/tnl.doxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index b985b8d..e6d6572 100644
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -40,7 +40,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = tnl_dd.tag=../tnl \
+TAGFILES   = tnl_dd.tag=../tnl_dd \
  main.tag=../main \
  math.tag=../math \
  swrast.tag=../swrast \
-- 
2.5.0

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

[Mesa-dev] [PATCH 5/9] doxygen: Remove references to miniglx

[Rhys Kidd]

miniglx was removed in February 2010. Clean up remaining
unnecessary doxygen references.

  commit a9e36696837b2c31ecee4017a0adffbd987c1eff
  Author: Kristian Høgsberg <k...@bitplanet.net>
  Date:   Thu Feb 25 16:17:04 2010 -0500

  Remove remaining miniglx references

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/.gitignore | 1 -
 doxygen/core_subset.doxy   | 3 +--
 doxygen/header_subset.html | 1 -
 doxygen/radeon_subset.doxy | 3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index 1c186cb..ddb2093 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -13,7 +13,6 @@ i965
 main
 math
 math_subset
-miniglx
 radeondrm
 radeonfb
 radeon_subset
diff --git a/doxygen/core_subset.doxy b/doxygen/core_subset.doxy
index dfa59f4..4123485 100644
--- a/doxygen/core_subset.doxy
+++ b/doxygen/core_subset.doxy
@@ -190,8 +190,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---
 TAGFILES   = \
-math_subset.tag=../math_subset \
-miniglx.tag=../miniglx
+math_subset.tag=../math_subset
 GENERATE_TAGFILE   = core_subset.tag
 ALLEXTERNALS   = NO
 PERL_PATH  = 
diff --git a/doxygen/header_subset.html b/doxygen/header_subset.html
index f9a698d..4dacc15 100644
--- a/doxygen/header_subset.html
+++ b/doxygen/header_subset.html
@@ -6,6 +6,5 @@
 
 Mesa Core |
 math |
-MiniGLX |
 radeon_subset
 
diff --git a/doxygen/radeon_subset.doxy b/doxygen/radeon_subset.doxy
index fb9d0e9..ad4399c 100644
--- a/doxygen/radeon_subset.doxy
+++ b/doxygen/radeon_subset.doxy
@@ -168,8 +168,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 TAGFILES   = \
 core_subset.tag=../core_subset \
- math_subset.tag=../math_subset \
- miniglx.tag=../miniglx
+ math_subset.tag=../math_subset
 GENERATE_TAGFILE   = radeon_subset.tag
 ALLEXTERNALS   = NO
 PERL_PATH  = 
-- 
2.5.0

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

[Mesa-dev] [PATCH 9/9] doxygen: Remove deprecated settings in common.doxy

[Rhys Kidd]

These Doxygen features are deprecated, as reported by Doxygen 1.8.9.1

Warning: Tag `USE_WINDOWS_ENCODING' at line 66 of file `common.doxy' has become 
obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `DETAILS_AT_TOP' at line 157 of file `common.doxy' has become 
obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `HTML_ALIGN_MEMBERS' at line 616 of file `common.doxy' has become 
obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `XML_SCHEMA' at line 848 of file `common.doxy' has become obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `XML_DTD' at line 854 of file `common.doxy' has become obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `MAX_DOT_GRAPH_WIDTH' at line 1115 of file `common.doxy' has 
become obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `MAX_DOT_GRAPH_HEIGHT' at line 1123 of file `common.doxy' has 
become obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/common.doxy | 51 ---
 1 file changed, 51 deletions(-)

diff --git a/doxygen/common.doxy b/doxygen/common.doxy
index 48f0c95..eec59c4 100644
--- a/doxygen/common.doxy
+++ b/doxygen/common.doxy
@@ -53,16 +53,6 @@ CREATE_SUBDIRS = NO
 
 OUTPUT_LANGUAGE= English
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows 
users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
 # the file and class documentation (similar to JavaDoc). 
@@ -147,13 +137,6 @@ JAVADOC_AUTOBRIEF  = YES
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP = YES
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # re-implements.
@@ -607,12 +590,6 @@ HTML_FOOTER=
 
 HTML_STYLESHEET= 
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
 # Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
@@ -839,18 +816,6 @@ GENERATE_XML   = NO
 
 XML_OUTPUT = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD= 
-
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
 # dump the program listings (including syntax highlighting 
 # and cross-referencing information) to the XML output. Note that 
@@ -1104,22 +1069,6 @@ DOT_PATH   =
 
 DOTFILE_DIRS   = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH= 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to tru

[Mesa-dev] [PATCH 2/9] doxygen: Fix doxygen/glapi.doxy

[Rhys Kidd]

The src/mesa/glapi folder was relocated in the below commit.
Amend the doxygen/glapi.doxy INPUT setting accordingly.

Whilst here, in addition this change also avoids a bug in the
consolidated Doxygen output caused by doxygen/glapi.doxy inadvertently
overwriting doxygen/swrast.tag via its GENERATE_TAGFILE setting.

This bug depended upon the specific order each *.tag was built.

   commit 296adbd545b8efd38c9ed508166b2de2764a444b
   Author: Chia-I Wu <o...@lunarg.com>
   Date:   Mon Apr 26 12:56:44 2010 +0800

   glapi: Move to src/mapi/.

   Move glapi to src/mapi/{glapi,es1api,es2api}.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/glapi.doxy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
index 3290f84..0e169e4 100644
--- a/doxygen/glapi.doxy
+++ b/doxygen/glapi.doxy
@@ -9,7 +9,7 @@ PROJECT_NAME   = "Mesa GL API dispatcher"
 #---
 # configuration options related to the input files
 #---
-INPUT  = ../src/mesa/glapi/
+INPUT  = ../src/mapi/glapi/
 FILE_PATTERNS  = *.c *.h
 RECURSIVE  = NO
 EXCLUDE= 
@@ -46,4 +46,4 @@ TAGFILES   = main.tag=../core \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
  vbo.tag=vbo
-GENERATE_TAGFILE   = swrast.tag
+GENERATE_TAGFILE   = glapi.tag
-- 
2.5.0

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

[Mesa-dev] [PATCH 3/9] doxygen: Correct TAGFILE relative paths

[Rhys Kidd]

Per Doxygen documentation, to combine external documentation (stored in
a *.tag file) with a project the TAGFILES option should be set in the
configuration file.

  A tag file typically only contains a relative location of the
  documentation from the point where doxygen was run. So when
  you include a tag file in other project you have to specify
  where the external documentation is located in relation this
  project.

  You can do this in the configuration file by assigning the
  (relative) location to the tag files specified after the
  TAGFILES configuration option.

  If you use a relative path it should be relative with respect
  to the directory where the HTML output of your project is
  generated; so a relative path from the HTML output directory
  of a project to the HTML output of the other project that is
  linked to.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/gbm.doxy| 2 +-
 doxygen/glapi.doxy  | 2 +-
 doxygen/i965.doxy   | 2 +-
 doxygen/swrast.doxy | 2 +-
 doxygen/tnl.doxy| 4 ++--
 doxygen/tnl_dd.doxy | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doxygen/gbm.doxy b/doxygen/gbm.doxy
index 37e4aa0..d0f7f95 100644
--- a/doxygen/gbm.doxy
+++ b/doxygen/gbm.doxy
@@ -44,5 +44,5 @@ TAGFILES   = main.tag=../core \
  tnl_dd.tag=../tnl_dd \
  swrast_setup.tag=../gbm_setup \
  tnl.tag=../tnl \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = gbm.tag
diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
index 0e169e4..d4d967a 100644
--- a/doxygen/glapi.doxy
+++ b/doxygen/glapi.doxy
@@ -45,5 +45,5 @@ TAGFILES   = main.tag=../core \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = glapi.tag
diff --git a/doxygen/i965.doxy b/doxygen/i965.doxy
index a3aa2b6..014245e 100644
--- a/doxygen/i965.doxy
+++ b/doxygen/i965.doxy
@@ -46,5 +46,5 @@ TAGFILES   = glsl.tag=../glsl \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
  tnl_dd.tag=../tnl_dd \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = i965.tag
diff --git a/doxygen/swrast.doxy b/doxygen/swrast.doxy
index fa07afd..520764f 100644
--- a/doxygen/swrast.doxy
+++ b/doxygen/swrast.doxy
@@ -44,5 +44,5 @@ TAGFILES   = main.tag=../core \
  tnl_dd.tag=../tnl_dd \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = swrast.tag
diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index 85ef56c..09f5c1c 100644
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -44,6 +44,6 @@ TAGFILES   = tnl_dd.tag=../tnl \
  main.tag=../core \
  math.tag=../math \
  swrast.tag=../swrast \
- swrast_setup.tag=swrast_setup \
- vbo.tag=vbo
+ swrast_setup.tag=../swrast_setup \
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = tnl.tag
diff --git a/doxygen/tnl_dd.doxy b/doxygen/tnl_dd.doxy
index 5404f37..d8fed0a 100644
--- a/doxygen/tnl_dd.doxy
+++ b/doxygen/tnl_dd.doxy
@@ -44,5 +44,5 @@ TAGFILES   = main.tag=../core \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = tnl_dd.tag
-- 
2.5.0

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

[Mesa-dev] [PATCH 6/9] doxygen: Update .gitignore

[Rhys Kidd]

The last of these output directories was removed in 2007.

  commit c2e0570831ae130fce1fa374bebe25bb9c561e29
  Author: Jerome Glisse <gli...@freedesktop.org>
  Date:   Fri Feb 16 23:18:56 2007 +0100

  Update doxygen doc to reflet vbo changes.

  Update doxygen doc, array_cache no longuer exist,
  new shiny vbo modules is there. Tested on unix,
  but i think i didn't broke that bat :).

  commit 3ef972f538e1ff207f5919a8068bf14af18fb270
  Author: Brian Paul <brian.p...@tungstengraphics.com>
  Date:   Sun May 16 22:07:02 2004 +

  Replaced 'core' with 'main'.
  Other minor updates.

  commit 69db632a9df035cdc852cc64fb14038919929a70
  Author: Jose Fonseca <j_r_fons...@yahoo.co.uk>
  Date:   Thu May 1 23:32:54 2003 +

  Move the Doxygen configuration files into the usual places and integrate 
with the build system.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/.gitignore | 5 -
 1 file changed, 5 deletions(-)

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index ddb2093..ea67dd5 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -1,9 +1,6 @@
 *.db
 *.tag
 *.tmp
-agpgart
-array_cache
-core
 core_subset
 gallium
 gbm
@@ -13,8 +10,6 @@ i965
 main
 math
 math_subset
-radeondrm
-radeonfb
 radeon_subset
 swrast
 swrast_setup
-- 
2.5.0

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

[Mesa-dev] [PATCH 7/9] doxygen: Correct TAGFILE linkage of main

[Rhys Kidd]

core.doxy was renamed to main.doxy, along with output folder in
the below 2004 commit.

Correct the other modules' TAGFILE linkage to find the main folder.

  commit 3ef972f538e1ff207f5919a8068bf14af18fb270
  Author: Brian Paul <brian.p...@tungstengraphics.com>
  Date:   Sun May 16 22:07:02 2004 +

  Replaced 'core' with 'main'.
  Other minor updates.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/gbm.doxy  | 2 +-
 doxygen/glapi.doxy| 2 +-
 doxygen/math.doxy | 2 +-
 doxygen/swrast.doxy   | 2 +-
 doxygen/swrast_setup.doxy | 2 +-
 doxygen/tnl.doxy  | 2 +-
 doxygen/tnl_dd.doxy   | 2 +-
 doxygen/vbo.doxy  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doxygen/gbm.doxy b/doxygen/gbm.doxy
index 8cfe98a..537d682 100644
--- a/doxygen/gbm.doxy
+++ b/doxygen/gbm.doxy
@@ -39,7 +39,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = main.tag=../core \
+TAGFILES   = main.tag=../main \
  math.tag=../math \
  tnl_dd.tag=../tnl_dd \
  swrast_setup.tag=../swrast_setup \
diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
index d4d967a..10046b9 100644
--- a/doxygen/glapi.doxy
+++ b/doxygen/glapi.doxy
@@ -39,7 +39,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = main.tag=../core \
+TAGFILES   = main.tag=../main \
  math.tag=../math \
  tnl_dd.tag=../tnl_dd \
  swrast.tag=../swrast \
diff --git a/doxygen/math.doxy b/doxygen/math.doxy
index 388af40..b260112 100644
--- a/doxygen/math.doxy
+++ b/doxygen/math.doxy
@@ -41,7 +41,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---
 TAGFILES   = tnl_dd.tag=../tnl_dd \
- main.tag=../core \
+ main.tag=../main \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
diff --git a/doxygen/swrast.doxy b/doxygen/swrast.doxy
index 520764f..cbab130 100644
--- a/doxygen/swrast.doxy
+++ b/doxygen/swrast.doxy
@@ -39,7 +39,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = main.tag=../core \
+TAGFILES   = main.tag=../main \
  math.tag=../math \
  tnl_dd.tag=../tnl_dd \
  swrast_setup.tag=../swrast_setup \
diff --git a/doxygen/swrast_setup.doxy b/doxygen/swrast_setup.doxy
index ee6f3ff..3141476 100644
--- a/doxygen/swrast_setup.doxy
+++ b/doxygen/swrast_setup.doxy
@@ -41,7 +41,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---
 TAGFILES   = tnl_dd.tag=../tnl_dd \
- main.tag=../core \
+ main.tag=../main \
  math.tag=../math \
  swrast.tag=../swrast \
  tnl.tag=../tnl \
diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index 09f5c1c..b985b8d 100644
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -41,7 +41,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---
 TAGFILES   = tnl_dd.tag=../tnl \
- main.tag=../core \
+ main.tag=../main \
  math.tag=../math \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
diff --git a/doxygen/tnl_dd.doxy b/doxygen/tnl_dd.doxy
index d8fed0a..172e46f 100644
--- a/doxygen/tnl_dd.doxy
+++ b/doxygen/tnl_dd.doxy
@@ -39,7 +39,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = main.tag=../core \
+TAGFILES   = main

[Mesa-dev] [PATCH 4/9] doxygen: Fix doxygen/gbm.doxy TAGFILES

[Rhys Kidd]

There has never been a doxygen/gbm_setup output folder.

Appears to have been a copy-paste error from original commit
in 245341f406bbdf23fec3d8ea8ad95c147c11ad1c.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/gbm.doxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxygen/gbm.doxy b/doxygen/gbm.doxy
index d0f7f95..8cfe98a 100644
--- a/doxygen/gbm.doxy
+++ b/doxygen/gbm.doxy
@@ -42,7 +42,7 @@ SKIP_FUNCTION_MACROS   = YES
 TAGFILES   = main.tag=../core \
  math.tag=../math \
  tnl_dd.tag=../tnl_dd \
- swrast_setup.tag=../gbm_setup \
+ swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
  vbo.tag=../vbo
 GENERATE_TAGFILE   = gbm.tag
-- 
2.5.0

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

[Mesa-dev] [PATCH 1/9] doxygen: Remove src/mesa/shader/ references

[Rhys Kidd]

Mesa has not had a src/mesa/shader/ folder since Mesa 7.9 removed it
in October 2010, as part of a revised GLSL compiler written by Intel.

Remove doxygen/shader.doxy and consequential changes made throughout.

In addition to removing an unnecessary Doxygen doxyfile, this change also
avoids a bug in the consolidated Doxygen output caused by
doxygen/shader.doxy inadvertently overwriting doxygen/swrast.tag via its
GENERATE_TAGFILE setting.

This bug depended upon the specific order each *.tag was built.

Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
---
 doxygen/.gitignore  |  1 -
 doxygen/Makefile|  1 -
 doxygen/doxy.bat|  2 --
 doxygen/header.html |  1 -
 doxygen/main.doxy   |  1 -
 doxygen/shader.doxy | 49 -
 doxygen/tnl.doxy|  1 -
 doxygen/tnl_dd.doxy |  1 -
 doxygen/vbo.doxy|  1 -
 9 files changed, 58 deletions(-)
 delete mode 100644 doxygen/shader.doxy

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index a5f3921..1c186cb 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -17,7 +17,6 @@ miniglx
 radeondrm
 radeonfb
 radeon_subset
-shader
 swrast
 swrast_setup
 tnl
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 01c2691..b1bc15d 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -12,7 +12,6 @@ FULL = \
vbo.doxy \
glapi.doxy \
glsl.doxy \
-   shader.doxy \
swrast.doxy \
swrast_setup.doxy \
tnl.doxy \
diff --git a/doxygen/doxy.bat b/doxygen/doxy.bat
index 331b931..e566ca3 100644
--- a/doxygen/doxy.bat
+++ b/doxygen/doxy.bat
@@ -6,7 +6,6 @@ doxygen swrast_setup.doxy
 doxygen tnl.doxy
 doxygen core.doxy
 doxygen glapi.doxy
-doxygen shader.doxy
 
 echo Building again, to resolve tags
 doxygen tnl_dd.doxy
@@ -16,4 +15,3 @@ doxygen swrast.doxy
 doxygen swrast_setup.doxy
 doxygen tnl.doxy
 doxygen glapi.doxy
-doxygen shader.doxy
diff --git a/doxygen/header.html b/doxygen/header.html
index abd736f..034231c 100644
--- a/doxygen/header.html
+++ b/doxygen/header.html
@@ -10,7 +10,6 @@
 glsl |
 vbo |
 math |
-shader |
 swrast |
 swrast_setup |
 tnl |
diff --git a/doxygen/main.doxy b/doxygen/main.doxy
index c258031..0edcefa 100644
--- a/doxygen/main.doxy
+++ b/doxygen/main.doxy
@@ -43,7 +43,6 @@ TAGFILES  = tnl_dd.tag=../tnl_dd \
 vbo.tag=../vbo \
  glapi.tag=../glapi \
  math.tag=../math \
- shader.tag=../shader \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl
diff --git a/doxygen/shader.doxy b/doxygen/shader.doxy
deleted file mode 100644
index d8ad14c..000
--- a/doxygen/shader.doxy
+++ /dev/null
@@ -1,49 +0,0 @@
-# Doxyfile 0.1
-
-@INCLUDE   = common.doxy
-
-#---
-# General configuration options
-#---
-PROJECT_NAME   = "Mesa Vertex and Fragment Program code"
-#---
-# configuration options related to the input files
-#---
-INPUT  = ../src/mesa/shader/
-FILE_PATTERNS  = *.c *.h
-RECURSIVE  = NO
-EXCLUDE= 
-EXCLUDE_PATTERNS   = 
-EXAMPLE_PATH   = 
-EXAMPLE_PATTERNS   = 
-EXAMPLE_RECURSIVE  = NO
-IMAGE_PATH = 
-INPUT_FILTER   = 
-FILTER_SOURCE_FILES= NO
-#---
-# configuration options related to the HTML output
-#---
-HTML_OUTPUT= shader
-#---
-# Configuration options related to the preprocessor   
-#---
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION= NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES= YES
-INCLUDE_PATH   = ../include/
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED = 
-EXPAND_AS_DEFINED  = 
-SKIP_FUNCTION_MACROS   = YES
-#---
-# Configuration::addtions related to external references   
-#---
-TAGFILES   = main.tag=../core \
- math.tag=../math \
- tnl_dd.tag=../tnl_dd \
- swrast.tag=../swrast \
- swrast_setup.tag=../swrast_setup \
- tnl.tag=../tnl \
- vbo.tag=vbo
-GENERATE_TAGFILE   = swrast.tag
diff --git a/do

[Mesa-dev] [PATCH 0/9] doxygen: Clean up configuration file bit rot

[Rhys Kidd]

So this patchset is an effort to clean up the doxygen documentation bit rot.

Changes:
- Remove legacy *.doxy from intermediate TAGFILE linkage and .gitignore.
- Correct a relative path issue with .../vbo that has been copy pasted around.
- Remove deprecated doxygen settings from common.doxy.
- General tidy up given some files haven't been touched in c.10 years.

If anyone's documentation workflow depends on these assumption holding, please
shout out. Although, in that case there's more likely a tweak to your workflow
that's required.

Copying Sarah Sharp (Intel) and Elie Tournier given recent work in this area.
Hopefully also assists in getting the right eyes reviewing the patchset.

Rhys Kidd (9):
  doxygen: Remove src/mesa/shader/ references
  doxygen: Fix doxygen/glapi.doxy
  doxygen: Correct TAGFILE relative paths
  doxygen: Fix doxygen/gbm.doxy TAGFILES
  doxygen: Remove references to miniglx
  doxygen: Update .gitignore
  doxygen: Correct TAGFILE linkage of main
  doxygen: Fix typo in doxygen/tnl.doxy
  doxygen: Remove deprecated settings in common.doxy

 doxygen/.gitignore |  7 ---
 doxygen/Makefile   |  1 -
 doxygen/common.doxy| 51 --
 doxygen/core_subset.doxy   |  3 +--
 doxygen/doxy.bat   |  2 --
 doxygen/gbm.doxy   |  6 +++---
 doxygen/glapi.doxy |  8 
 doxygen/header.html|  1 -
 doxygen/header_subset.html |  1 -
 doxygen/i965.doxy  |  2 +-
 doxygen/main.doxy  |  1 -
 doxygen/math.doxy  |  2 +-
 doxygen/radeon_subset.doxy |  3 +--
 doxygen/shader.doxy| 49 
 doxygen/swrast.doxy|  4 ++--
 doxygen/swrast_setup.doxy  |  2 +-
 doxygen/tnl.doxy   |  9 
 doxygen/tnl_dd.doxy|  5 ++---
 doxygen/vbo.doxy   |  3 +--
 19 files changed, 21 insertions(+), 139 deletions(-)
 delete mode 100644 doxygen/shader.doxy

-- 
2.5.0

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

Re: [Mesa-dev] Updating mesa3d.org docs?

[Rhys Kidd]

On 9 April 2016 at 16:19, Brian Paul <bri...@vmware.com> wrote:

> On 04/09/2016 01:09 PM, Rhys Kidd wrote:
>
>> On Thursday, October 15, 2015, Brian Paul <bri...@vmware.com
>> <mailto:bri...@vmware.com>> wrote:
>>
>> On 10/15/2015 01:18 PM, Sarah Sharp wrote:
>>
>> Hi Brian!
>>
>>
>> Hi Sarah,
>>
>>
>> I'm a new Mesa developer in Intel's OTC graphics team (although
>> not new
>> to open source, I've been a Linux kernel developer for the last
>> seven
>> years).
>>
>> I heard that you're responsible for updating mesa3d.org
>> <
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__mesa3d.org=BQMFaQ=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8=2U9kWir1cBYA05OdS3Zeeks1wPxuSOcnsf-ajjN8M3I=snUhIuiDJwuTupwNo_RzgVx0GbxOEnLhAKIG1XTBYjg=
>> >
>> documentation
>> against the docs in the Mesa source code repo. I noticed the
>> docs are
>> out-of-date WRT the repo, and I had a couple questions:
>>
>> 1. What's the process for pushing updated documentation to the
>> site?
>>
>>
>> All the website pages are found in the git docs/ directory.  Changes
>> are submitted as patches and reviewed like code on the mesa-dev list.
>>
>>
>> 2. How often are updated docs pushed? Once every week, month, or
>> when
>>  there's a new Mesa version?
>>
>>
>> I push them whenever a new Mesa version is released, but I can do it
>> at any time on request.
>>
>>
>> Hello Brian,
>>
>> Now that Mesa 11.2 has been released, could you please push the docs to
>> mesa3d.org
>>
>
> I did a few days ago, but I guess I missed the envvars.html file.  It's
> there now.
>

Thanks Brian.

<
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__mesa3d.org=BQMFaQ=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8=2U9kWir1cBYA05OdS3Zeeks1wPxuSOcnsf-ajjN8M3I=snUhIuiDJwuTupwNo_RzgVx0GbxOEnLhAKIG1XTBYjg=
>> >?
>>
>> A number of relevant changes, however my selfish interest is to see the
>> vc4 debug settings in envvars.html make the website. The number of vc4
>> users and developers running on the Mesa stack are increasing.
>>
>
> -Brian
>
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] Updating mesa3d.org docs?

[Rhys Kidd]

On Thursday, October 15, 2015, Brian Paul  wrote:

> On 10/15/2015 01:18 PM, Sarah Sharp wrote:
>
>> Hi Brian!
>>
>
> Hi Sarah,
>
>
> I'm a new Mesa developer in Intel's OTC graphics team (although not new
>> to open source, I've been a Linux kernel developer for the last seven
>> years).
>>
>> I heard that you're responsible for updating mesa3d.org documentation
>> against the docs in the Mesa source code repo. I noticed the docs are
>> out-of-date WRT the repo, and I had a couple questions:
>>
>> 1. What's the process for pushing updated documentation to the site?
>>
>
> All the website pages are found in the git docs/ directory.  Changes are
> submitted as patches and reviewed like code on the mesa-dev list.
>
>
> 2. How often are updated docs pushed? Once every week, month, or when
>> there's a new Mesa version?
>>
>
> I push them whenever a new Mesa version is released, but I can do it at
> any time on request.
>
>
Hello Brian,

Now that Mesa 11.2 has been released, could you please push the docs to
mesa3d.org?

A number of relevant changes, however my selfish interest is to see the vc4
debug settings in envvars.html make the website. The number of vc4 users
and developers running on the Mesa stack are increasing.

Thanks in advance,
Rhys

3. Any chance I could get permissions to push updated docs?  I'll be
>> improving Mesa documentation as part of my new job, and I would love
>> to be able to push myself once patches are accepted, rather than
>> having to ping you.
>>
>
> The typical deal is we wait until a person has some track record of
> producing good patches before giving git-write/push privileges.
>
> So, I'd suggest you make some changes/patches, post them to the mesa-dev
> list for review (others can push them for you initially), and then when
> you've got some history established you can file a request (via bugzilla)
> for git privileges.
>
> -Brian
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATH v2] doxygen: Generate Doxygen for NIR

[Rhys Kidd]

LGTM,

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>

On Saturday, April 9, 2016, Elie TOURNIER <tournier.e...@gmail.com> wrote:

> Now, one can do the following to generate and read the nir Doxygen:
> cd $MESA_TOP/doxygen
> make
> firefox nir/index.html
>
> Update v2:
> Correct TAGFILES in nir.doxy
>
> Signed-off-by: Elie TOURNIER <tournier.e...@gmail.com <javascript:;>>
> ---
>  doxygen/.gitignore  |  1 +
>  doxygen/Makefile|  3 ++-
>  doxygen/header.html |  1 +
>  doxygen/nir.doxy| 50
> ++
>  4 files changed, 54 insertions(+), 1 deletion(-)
>  create mode 100644 doxygen/nir.doxy
>
> diff --git a/doxygen/.gitignore b/doxygen/.gitignore
> index a5f3921..ed94bed 100644
> --- a/doxygen/.gitignore
> +++ b/doxygen/.gitignore
> @@ -14,6 +14,7 @@ main
>  math
>  math_subset
>  miniglx
> +nir
>  radeondrm
>  radeonfb
>  radeon_subset
> diff --git a/doxygen/Makefile b/doxygen/Makefile
> index 01c2691..cbbb40e 100644
> --- a/doxygen/Makefile
> +++ b/doxygen/Makefile
> @@ -18,7 +18,8 @@ FULL = \
> tnl.doxy \
> tnl_dd.doxy \
> gbm.doxy \
> -   i965.doxy
> +   i965.doxy \
> +   nir.doxy
>
>  full: $(FULL:.doxy=.tag)
> $(foreach FILE,$(FULL),doxygen $(FILE);)
> diff --git a/doxygen/header.html b/doxygen/header.html
> index abd736f..8e656c1 100644
> --- a/doxygen/header.html
> +++ b/doxygen/header.html
> @@ -8,6 +8,7 @@
>  core |
>  glapi |
>  glsl |
> +nir |
>  vbo |
>  math |
>  shader |
> diff --git a/doxygen/nir.doxy b/doxygen/nir.doxy
> new file mode 100644
> index 000..cad7380
> --- /dev/null
> +++ b/doxygen/nir.doxy
> @@ -0,0 +1,50 @@
> +# Doxyfile 0.1
> +
> +@INCLUDE   = common.doxy
> +
>
> +#---
> +# General configuration options
>
> +#---
> +PROJECT_NAME   = "Mesa NIR module"
>
> +#---
> +# Configuration options related to the input files
>
> +#---
> +INPUT  = ../src/compiler/nir
> +FILE_PATTERNS  = *.c *.cpp *.h
> +RECURSIVE  = NO
> +EXCLUDE=
> +EXCLUDE_PATTERNS   =
> +EXAMPLE_PATH   =
> +EXAMPLE_PATTERNS   =
> +EXAMPLE_RECURSIVE  = NO
> +IMAGE_PATH =
> +INPUT_FILTER   =
> +FILTER_SOURCE_FILES= NO
>
> +#---
> +# Configuration options related to the HTML output
>
> +#---
> +HTML_OUTPUT= nir
>
> +#---
> +# Configuration options related to the preprocessor
>
> +#---
> +ENABLE_PREPROCESSING   = YES
> +MACRO_EXPANSION= NO
> +EXPAND_ONLY_PREDEF = NO
> +SEARCH_INCLUDES= YES
> +INCLUDE_PATH   = ../include/
> +INCLUDE_FILE_PATTERNS  =
> +PREDEFINED =
> +EXPAND_AS_DEFINED  =
> +SKIP_FUNCTION_MACROS   = YES
>
> +#---
> +# Configuration::additions related to external references
>
> +#---
> +TAGFILES   = glsl.tag=../glsl \
> + main.tag=../main \
> + math.tag=../math \
> + swrast.tag=../swrast \
> + swrast_setup.tag=../swrast_setup \
> + tnl.tag=../tnl \
> + tnl_dd.tag=../tnl_dd \
> + vbo.tag=../vbo
> +GENERATE_TAGFILE   = nir.tag
> --
> 1.9.1
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org <javascript:;>
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] doxygen: Generate Doxygen for NIR

[Rhys Kidd]

Hello Elie,

On 9 April 2016 at 08:50, Elie TOURNIER <tournier.e...@gmail.com> wrote:

> Now, one can do the following to generate and read the nir Doxygen:
> cd $MESA_TOP/doxygen
> make
> firefox nir/index.html
>
> Signed-off-by: Elie TOURNIER <tournier.e...@gmail.com>
> ---
>  doxygen/.gitignore  |  1 +
>  doxygen/Makefile|  3 ++-
>  doxygen/header.html |  1 +
>  doxygen/nir.doxy| 50
> ++
>  4 files changed, 54 insertions(+), 1 deletion(-)
>  create mode 100644 doxygen/nir.doxy
>
> diff --git a/doxygen/.gitignore b/doxygen/.gitignore
> index a5f3921..ed94bed 100644
> --- a/doxygen/.gitignore
> +++ b/doxygen/.gitignore
> @@ -14,6 +14,7 @@ main
>  math
>  math_subset
>  miniglx
> +nir
>  radeondrm
>  radeonfb
>  radeon_subset
> diff --git a/doxygen/Makefile b/doxygen/Makefile
> index 01c2691..cbbb40e 100644
> --- a/doxygen/Makefile
> +++ b/doxygen/Makefile
> @@ -18,7 +18,8 @@ FULL = \
> tnl.doxy \
> tnl_dd.doxy \
> gbm.doxy \
> -   i965.doxy
> +   i965.doxy \
> +   nir.doxy
>
>  full: $(FULL:.doxy=.tag)
> $(foreach FILE,$(FULL),doxygen $(FILE);)
> diff --git a/doxygen/header.html b/doxygen/header.html
> index abd736f..8e656c1 100644
> --- a/doxygen/header.html
> +++ b/doxygen/header.html
> @@ -8,6 +8,7 @@
>  core |
>  glapi |
>  glsl |
> +nir |
>  vbo |
>  math |
>  shader |
> diff --git a/doxygen/nir.doxy b/doxygen/nir.doxy
> new file mode 100644
> index 000..7e431ac
> --- /dev/null
> +++ b/doxygen/nir.doxy
> @@ -0,0 +1,50 @@
> +# Doxyfile 0.1
> +
> +@INCLUDE   = common.doxy
> +
>
> +#---
> +# General configuration options
>
> +#---
> +PROJECT_NAME   = "Mesa NIR module"
>
> +#---
> +# Configuration options related to the input files
>
> +#---
> +INPUT  = ../src/compiler/nir
> +FILE_PATTERNS  = *.c *.cpp *.h
> +RECURSIVE  = NO
> +EXCLUDE=
> +EXCLUDE_PATTERNS   =
> +EXAMPLE_PATH   =
> +EXAMPLE_PATTERNS   =
> +EXAMPLE_RECURSIVE  = NO
> +IMAGE_PATH =
> +INPUT_FILTER   =
> +FILTER_SOURCE_FILES= NO
>
> +#---
> +# Configuration options related to the HTML output
>
> +#---
> +HTML_OUTPUT= nir
>
> +#---
> +# Configuration options related to the preprocessor
>
> +#---
> +ENABLE_PREPROCESSING   = YES
> +MACRO_EXPANSION= NO
> +EXPAND_ONLY_PREDEF = NO
> +SEARCH_INCLUDES= YES
> +INCLUDE_PATH   = ../include/
> +INCLUDE_FILE_PATTERNS  =
> +PREDEFINED =
> +EXPAND_AS_DEFINED  =
> +SKIP_FUNCTION_MACROS   = YES
>
> +#---
> +# Configuration::additions related to external references
>
> +#---
> +TAGFILES   = glsl.tag=../glsl \
> + main.tag=../main \
> + math.tag=../math \
> + swrast.tag=../swrast \
> + swrast_setup.tag=../swrast_setup \
> + tnl.tag=../tnl \
> + tnl_dd.tag=../tnl_dd \
> + vbo.tag=vbo
>

With the above line replaced with 'vbo.tag=../vbo' that patch would get my:

Reviewed-by: Rhys Kidd <rhysk...@gmail.com>

I'm about to publish a set of patches that make that correction throughout
$MESA_TOP/doxygen, however no point adding another incorrect one while
you're at it.


> +GENERATE_TAGFILE   = nir.tag
> --
> 1.9.1
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev