Re: [Mesa-dev] [PATCH v4] virgl: Add support for glGetMultisample

2018-07-10 Thread Dave Airlie
On 10 July 2018 at 16:57, David Airlie wrote: > > > On Tue, Jul 10, 2018 at 4:44 PM, Gert Wollny > wrote: >> >> Am Dienstag, den 10.07.2018, 09:19 +1000 schrieb Dave Airlie: >> > >> > Just FYI in future please don't push mesa patches until the renderer >> > side patch has landed, this is to avoid

Re: [Mesa-dev] [PATCH 1/3] vulkan: Define new VK_MESA_query_timestamp extension [v2]

2018-07-10 Thread Pekka Paalanen
On Sat, 23 Jun 2018 12:13:53 -0500 Jason Ekstrand wrote: > I haven't thought through this comment all that hard but would it make > sense to have three timestamps, CPU, GPU, CPU so that you have error bars > on the GPU timestamp? At the very least, two timestamps would be better > than one so

[Mesa-dev] [Bug 107176] Mesa Vulkan build fails on Ubuntu 16.04 for dependencies not caught by Mesa configure

2018-07-10 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=107176 Bug ID: 107176 Summary: Mesa Vulkan build fails on Ubuntu 16.04 for dependencies not caught by Mesa configure Product: Mesa Version: git Hardware: Other OS

[Mesa-dev] [Bug 106843] Cannot build osmesa with GLES (shared glapi) using Scons and MSVC

2018-07-10 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=106843 --- Comment #8 from Alex Granni --- (In reply to Alex Granni from comment #7) > (In reply to Eric Engestrom from comment #4) > > Hi Alex, > > Would you mind testing the work-in-progress branch and report if it works > > when building with Meson?

[Mesa-dev] [PATCH 0/3] Sweep NIR after linking phase to free held memory

2018-07-10 Thread Danylo Piliaiev
This patch series is a draft changes to reduce memory usage when compiling shaders and add utility function to calculate a size of memory contexts. The issue I'm attempting to fix described in the bug: https://bugs.freedesktop.org/show_bug.cgi?id=103274 In short some 32bit games under Wine use a l

[Mesa-dev] [PATCH 1/3] i965: Sweep NIR after linking phase to free held memory

2018-07-10 Thread Danylo Piliaiev
After optimization passes and many trasfromations most of memory NIR holds is a garbage which was being freed only after shader deletion. Freeing it at the end of linking will save memory which would be useful in case there are a lot of complex shaders being compiled. The common case for this issue

[Mesa-dev] [PATCH 2/3] st: Sweep NIR after linking phase to free held memory

2018-07-10 Thread Danylo Piliaiev
After optimization passes and many trasfromations most of memory NIR holds is a garbage which was being freed only after shader deletion. Freeing it at the end of linking will save memory which would be useful in case there are a lot of complex shaders being compiled. The common case for this issue

[Mesa-dev] [PATCH 3/3] ralloc: Add ralloc_calc_size to measure memory held by memory contexts

2018-07-10 Thread Danylo Piliaiev
The function recursively calculates memory held by context's children. It is aimed to easier debugging of excessive memory usage with ralloc. It will work only if malloc_usable_size is available. Signed-off-by: Danylo Piliaiev --- src/util/ralloc.c | 30 ++ src/util/r

[Mesa-dev] [PATCH 48/48] tests/vma: fix build with MSVC

2018-07-10 Thread Liviu Prodea
I tried the Meson Windows branch posted by Dylan Baker now available on Freedesktop Gitlab with default configuration but unfortunately it didn't work for me. Build script @set mesa=C:\Software\Development\projects\mesa @SET PATH=C:\Software\Development\Git\cmd\;%mesa%\Python\;%me

[Mesa-dev] [Bug 107176] Mesa Vulkan build fails on Ubuntu 16.04 for dependencies not caught by Mesa configure

2018-07-10 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=107176 Sergii Romantsov changed: What|Removed |Added CC||sergii.romantsov@globallogi

Re: [Mesa-dev] [PATCH 1/2] glsl: slim the kill_entry struct used in const propagation

2018-07-10 Thread Thomas Helland
2018-07-09 20:59 GMT+02:00 Caio Marcelo de Oliveira Filho : > Since 4654439fdd7 "glsl: Use hash tables for > opt_constant_propagation() kill sets." uses a hash_table for storing > kill_entries, so the structs can be simplified. > > Remove the exec_node from kill_entry since it is not used in an > e

[Mesa-dev] [PATCH] i965/tex: ignore the diff between GL_TEXTURE_2D and GL_TEXTURE_RECTANGLE

2018-07-10 Thread Andrii Simiklit
the difference between GL_TEXTURE_2D and GL_TEXTURE_RECTANGLE doesn't matter as far as the miptree is concerned; genX(update_sampler_state) only looks at the gl_texture_object and not the miptree when determining whether or not to use normalized coordinates. Signed-off-by: Andrii Simiklit Bugzil

Re: [Mesa-dev] [PATCH] gallium/u_transfer_helper: Initialize the stride of MSAA maps.

2018-07-10 Thread Rob Clark
On Tue, Jul 10, 2018 at 2:07 AM, Eric Anholt wrote: > We just never set the value that was returned for MSAA mappings (directly > reading back an MSAA framebuffer). Since we're handing back ss_map, it > should be ss_map's stride from our nested transfer. > > Fixes piglit /home/anholt/src/piglit/b

[Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Gert Wollny
For three component textures virgl faces the problem that the host driver may report that these can not be used as a render target, and when the client requests such a texture a four-componet texture will be choosen even if only a sampler view was requested. One example where this happens is with t

Re: [Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Erik Faye-Lund
On 10. juli 2018 15:42, Gert Wollny wrote: For three component textures virgl faces the problem that the host driver may report that these can not be used as a render target, and when the client requests such a texture a four-componet texture will be choosen even if only a sampler view was reques

Re: [Mesa-dev] [PATCH v4 7/7] i965: enable INTEL_blackhole_render

2018-07-10 Thread Daniel Vetter
On Wed, Jun 20, 2018 at 06:25:34PM +0100, Lionel Landwerlin wrote: > v2: condition the extension on context isolation support from the > kernel (Chris) > > v3: (Lionel) > > The initial version of this change used a feature of the Gen7+ > command parser to turn the primitive instructio

[Mesa-dev] [PATCH 5/5] radv: simplify the logic in radv_set_descriptor_set()

2018-07-10 Thread Samuel Pitoiset
Now that 'set' can't be NULL because the meta operations no longer bind a NULL descriptor, the logic can be simplified a little bit. Signed-off-by: Samuel Pitoiset --- src/amd/vulkan/radv_cmd_buffer.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_c

[Mesa-dev] [PATCH 1/5] radv: get rid of buffer object priorities

2018-07-10 Thread Samuel Pitoiset
We mostly use the same priority for all buffer objects, so I don't think that matter much. This should reduce CPU overhead a little bit. Signed-off-by: Samuel Pitoiset --- src/amd/vulkan/radv_cmd_buffer.c | 36 +-- src/amd/vulkan/radv_descriptor_set.c | 6 +- src/a

[Mesa-dev] [PATCH 4/5] radv: remove one useless check in radv_bind_descriptor_set()

2018-07-10 Thread Samuel Pitoiset
'set' shouldn't be NULL. Signed-off-by: Samuel Pitoiset --- src/amd/vulkan/radv_cmd_buffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 5247413b33..11f4c29db4 100644 --- a/src/amd/vulkan/radv_cmd

[Mesa-dev] [PATCH 3/5] radv/meta: do not restore a NULL descriptor

2018-07-10 Thread Samuel Pitoiset
Signed-off-by: Samuel Pitoiset --- src/amd/vulkan/radv_meta.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index 00a20d155e..a59f38fb21 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@

[Mesa-dev] [PATCH 2/5] radv: remove unnecessary verification code around ring_offsets_idx

2018-07-10 Thread Samuel Pitoiset
I don't want to waste CPU cycles for nothing. Signed-off-by: Samuel Pitoiset --- src/amd/vulkan/radv_cmd_buffer.c | 17 - src/amd/vulkan/radv_private.h| 1 - 2 files changed, 18 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c in

Re: [Mesa-dev] [PATCH v4 7/7] i965: enable INTEL_blackhole_render

2018-07-10 Thread Lionel Landwerlin
On 10/07/18 15:04, Daniel Vetter wrote: On Wed, Jun 20, 2018 at 06:25:34PM +0100, Lionel Landwerlin wrote: v2: condition the extension on context isolation support from the kernel (Chris) v3: (Lionel) The initial version of this change used a feature of the Gen7+ command parser

Re: [Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Gert Wollny
Am Dienstag, den 10.07.2018, 16:01 +0200 schrieb Erik Faye-Lund: > On 10. juli 2018 15:42, Gert Wollny wrote: > > For three component textures virgl faces the problem that the host > > driver > > may report that these can not be used as a render target, and when > > the > > client requests such a t

Re: [Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Erik Faye-Lund
On 10. juli 2018 16:23, Gert Wollny wrote: Am Dienstag, den 10.07.2018, 16:01 +0200 schrieb Erik Faye-Lund: On 10. juli 2018 15:42, Gert Wollny wrote: For three component textures virgl faces the problem that the host driver may report that these can not be used as a render target, and when the

Re: [Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Ilia Mirkin
In practice, no one allocates GL_RGB textures. Only RGBX/RGBA. In part due to this issue, an in part due to the hardware not being able to support rendering to such textures (and usually not texturing either). ARB_tbo_rgb32 is part of GLES 3.1 as I recall, but this only has to do with buffer objec

Re: [Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Gert Wollny
Am Dienstag, den 10.07.2018, 16:30 +0200 schrieb Erik Faye-Lund: > > [snip] > On 10. juli 2018 16:23, Gert Wollny wrote: > > Since this is also written in the 4.5 spec, and the Intel driver > > advertises this version, but the test to attach such a texture to a > > frame buffer device results in

Re: [Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Gert Wollny
Am Dienstag, den 10.07.2018, 10:47 -0400 schrieb Ilia Mirkin: > In practice, no one allocates GL_RGB textures. Only RGBX/RGBA. In > part due to this issue, an in part due to the hardware not being able > to support rendering to such textures (and usually not texturing > either). I see. Well, I was

Re: [Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Ilia Mirkin
On Tue, Jul 10, 2018 at 10:59 AM, Gert Wollny wrote: > Am Dienstag, den 10.07.2018, 10:47 -0400 schrieb Ilia Mirkin: >> In practice, no one allocates GL_RGB textures. Only RGBX/RGBA. In >> part due to this issue, an in part due to the hardware not being able >> to support rendering to such texture

Re: [Mesa-dev] [PATCH 1/3] i965: Sweep NIR after linking phase to free held memory

2018-07-10 Thread Jason Ekstrand
I think we can just move it up a couple of loops to the place where we do the final lowering and call gather_info. Other than that, this seems like a good idea to me. NIR passes are pretty sloppy about memory and assume nir_sweep gets called. Hanging on to linked shaders with all that garbage fl

Re: [Mesa-dev] [RFC PATCH] mesa/st: don't prematurely optimize for render targets when on virgl

2018-07-10 Thread Gert Wollny
Am Dienstag, den 10.07.2018, 11:03 -0400 schrieb Ilia Mirkin: > > Here's how every real driver handles it: > > If it's a texture, don't support rgb-only formats (except r11g11b10f > and so on). > > In the is_format_supported check, there are explicit tests for target > == PIPE_BUFFER in order to

Re: [Mesa-dev] [PATCH 1/3] i965: Sweep NIR after linking phase to free held memory

2018-07-10 Thread Danylo Piliaiev
Indeed it would be better to move it, will be done. On 10.07.18 18:04, Jason Ekstrand wrote: I think we can just move it up a couple of loops to the place where we do the final lowering and call gather_info. Other than that, this seems like a good idea to me.  NIR passes are pretty sloppy about

Re: [Mesa-dev] [PATCH] i965/tex: ignore the diff between GL_TEXTURE_2D and GL_TEXTURE_RECTANGLE

2018-07-10 Thread Jason Ekstrand
On Tue, Jul 10, 2018 at 4:13 AM Andrii Simiklit wrote: > the difference between GL_TEXTURE_2D and GL_TEXTURE_RECTANGLE > doesn't matter as far as the miptree is concerned; > genX(update_sampler_state) only looks at the > gl_texture_object and not the miptree when determining whether or > not to u

[Mesa-dev] [Bug 107176] Mesa Vulkan build fails on Ubuntu 16.04 for dependencies not caught by Mesa configure

2018-07-10 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=107176 Jason Ekstrand changed: What|Removed |Added Assignee|mesa-dev@lists.freedesktop. |kei...@keithp.com |o

[Mesa-dev] [Bug 106843] Cannot build osmesa with GLES (shared glapi) using Scons and MSVC

2018-07-10 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=106843 --- Comment #9 from Alex Granni --- (In reply to Alex Granni from comment #8) > (In reply to Alex Granni from comment #7) > > (In reply to Eric Engestrom from comment #4) > > > Hi Alex, > > > Would you mind testing the work-in-progress branch an

[Mesa-dev] [Bug 107170] Build fails if building against X server/libxrandr with no leases support

2018-07-10 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=107170 Eero Tamminen changed: What|Removed |Added See Also||https://bugs.freedesktop.or

[Mesa-dev] [PATCH 48/48] tests/vma: fix build with MSVC

2018-07-10 Thread Liviu Prodea
For the series https://patchwork.freedesktop.org/series/44596/ Updating Meson from 0.46.1 to 0.47.0 sorted the build system generating failure posted about earlier and eventually got a successful build. Note that I am using Python 3.7. Though I remember getting very similar errors with Python 3.

[Mesa-dev] [Bug 107179] mm

2018-07-10 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=107179 Bug ID: 107179 Summary: mm Product: Mesa Version: 18.0 Hardware: Other OS: All Status: NEW Severity: critical Priority: medium Compone

Re: [Mesa-dev] [PATCH mesa 1/3] vulkan: Define new VK_MESA_query_timestamp extension [v3]

2018-07-10 Thread Jason Ekstrand
On Mon, Jul 9, 2018 at 5:35 PM Keith Packard wrote: > This extension adds a single function to query the current GPU > timestamp, just like glGetInteger64v(GL_TIMESTAMP, ×tamp). This > function is needed to complete the implementation of > GOOGLE_display_timing, which needs to be able to correlat

Re: [Mesa-dev] [PATCH] i965/tex: ignore the diff between GL_TEXTURE_2D and GL_TEXTURE_RECTANGLE

2018-07-10 Thread Jason Ekstrand
Ugh... not so good. According to Oliver on the bug, this just make the assert go away and doesn't actually fix anything. Likely this is needed but not sufficient. --Jason On Tue, Jul 10, 2018 at 8:17 AM Jason Ekstrand wrote: > On Tue, Jul 10, 2018 at 4:13 AM Andrii Simiklit > wrote: > >> the

Re: [Mesa-dev] [PATCH mesa 1/3] vulkan: Define new VK_MESA_query_timestamp extension [v3]

2018-07-10 Thread Jason Ekstrand
On Tue, Jul 10, 2018 at 9:47 AM Jason Ekstrand wrote: > On Mon, Jul 9, 2018 at 5:35 PM Keith Packard wrote: > >> This extension adds a single function to query the current GPU >> timestamp, just like glGetInteger64v(GL_TIMESTAMP, ×tamp). This >> function is needed to complete the implementation

Re: [Mesa-dev] [PATCH 1/3] vulkan: Define new VK_MESA_query_timestamp extension [v2]

2018-07-10 Thread Keith Packard
Pekka Paalanen writes: > On Sat, 23 Jun 2018 12:13:53 -0500 > Jason Ekstrand wrote: > >> I haven't thought through this comment all that hard but would it make >> sense to have three timestamps, CPU, GPU, CPU so that you have error bars >> on the GPU timestamp? At the very least, two timestam

Re: [Mesa-dev] [PATCH mesa] meson: fix windows build

2018-07-10 Thread Dylan Baker
Quoting Eric Engestrom (2018-07-09 04:12:05) > The python installer on Windows installs two `python.exe`, one for > python2 and one for python3 and no `python2.exe` nor `python3.exe`. > > This seems utterly broken to me, but luckily for us meson handles this > craziness for us, but only since vers

Re: [Mesa-dev] [PATCH] gallium/u_transfer_helper: Fix MSAA mappings with nonzero x/y.

2018-07-10 Thread Rob Clark
On Mon, Jul 9, 2018 at 5:13 PM, Eric Anholt wrote: > We created a temporary with box->{width,height} and then tried to map > width,height from a nonzero offset when we meant to just map the whole > temporary. > > Fixes segfaults in V3D in dEQP-GLES3.functional.prerequisite.read_pixels > with --deq

Re: [Mesa-dev] [PATCH mesa] egl: drop unused _EGL_BUILT_IN_DRIVER_DRI2

2018-07-10 Thread Eric Anholt
Eric Engestrom writes: > Unused since b174a1ae720cb404738c "egl: Simplify the "driver" interface". > > Signed-off-by: Eric Engestrom Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesk

Re: [Mesa-dev] [PATCH 06/10] util/set: helper to remove entry by key

2018-07-10 Thread Eric Anholt
Caio Marcelo de Oliveira Filho writes: > On Thu, Jul 05, 2018 at 01:56:11PM -0700, Eric Anholt wrote: >> Caio Marcelo de Oliveira Filho writes: >> >> > --- >> >> This one should be trivial to unit test, with a present and non-present >> key. > > Done. > > Do you want the equivalent hash_table

[Mesa-dev] [PATCH] xvmc: Disable errors from tests when the host doesn't support XVMC.

2018-07-10 Thread Eric Anholt
These are connected as unit tests, so no breaking the build just because the host can't do it. If you wanted to test on a non-supporting host, you'd need some sort of mocking. --- src/gallium/state_trackers/xvmc/tests/test_blocks.c | 2 +- src/gallium/state_trackers/xvmc/tests/test_context.c

Re: [Mesa-dev] [PATCH] xvmc: Disable errors from tests when the host doesn't support XVMC.

2018-07-10 Thread Ilia Mirkin
Not opposed to this change, but FWIW these "tests" aren't tests at all. They require the proper binary to be pointed to by libXvMCW in order to operate properly. They're more like "programs to smoke-test an installation of xvmc". On Tue, Jul 10, 2018 at 3:42 PM, Eric Anholt wrote: > These are con

Re: [Mesa-dev] [PATCH v2 07/11] util/set: helper to remove entry by key

2018-07-10 Thread Eric Anholt
Caio Marcelo de Oliveira Filho writes: > v2: Add unit test. (Eric Anholt) 5-7 are: Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/list

Re: [Mesa-dev] [PATCH v2 04/11] glsl: separate copy propagation state

2018-07-10 Thread Eric Anholt
Caio Marcelo de Oliveira Filho writes: > Separate higher level logic of visiting instructions and chosing when > to store and use new copy data from the datastructure holding the copy > propagation information. This will also make easier later patches that > change the structure. > > v2: Remove e

Re: [Mesa-dev] [PATCH] xvmc: Disable errors from tests when the host doesn't support XVMC.

2018-07-10 Thread Dylan Baker
I think meson will report skip the return code is 127 or 128 (can't remember), but this seems fine too, or we can just remove them from the set of tests like Ilia suggested. For any of the above options, Reviewed-by: Dylan Baker Quoting Eric Anholt (2018-07-10 12:42:34) > These are connected as

Re: [Mesa-dev] [PATCH] r600: Add spill output to group only if register or target index changes

2018-07-10 Thread Roland Scheidegger
Am 05.07.2018 um 19:11 schrieb Gert Wollny: > The current spill code checks in each instruction of an instruction group > whether > spliing spilling > is needed and if so, it adds spilling for each component as a seperate > instruction and it allocates a new temporary for each component and since

Re: [Mesa-dev] [PATCH v2 08/11] glsl: change opt_copy_propagation_elements data structures

2018-07-10 Thread Eric Anholt
Caio Marcelo de Oliveira Filho writes: > Instead of keeping multiple acp_entries in lists, have a single > acp_entry per variable. With this, the implementation of clone is more > convenient and now fully implemented. In the previous code, clone was > only partial. > > Before this patch, each acp

Re: [Mesa-dev] [RFC v2 10/11] glsl: teach copy_propagation_elements to deal with whole variables

2018-07-10 Thread Eric Anholt
Caio Marcelo de Oliveira Filho writes: > Keep information in acp_entry whether the entry is full or not, and > use the ACP in more nodes when visiting the instructions: > > - add_copy: write whole variables to the ACP state (regardless the > type). > > - visit(ir_dereference_variable *): perfor

Re: [Mesa-dev] [PATCH 2/9] i965/fs: Register allocator shoudn't use grf127 for sends dest

2018-07-10 Thread Caio Marcelo de Oliveira Filho
> Since Gen8+ Intel PRM states that "r127 must not be used for return > address when there is a src and dest overlap in send instruction." The previous patch, that verifies the condition above is causing tests/spec/arb_compute_shader/linker/bug-93840.shader_test to crash with shader_run

[Mesa-dev] [PATCH v2 01/49] util: move process.[ch] to u_process.[ch]

2018-07-10 Thread Dylan Baker
On windows process.h is a system provided header, and it's required in include/c11/threads_win32.h. This header interferes with searching for that header, and results in windows build warnings with scons, but errors in meson which doesn't allow implicit function declarations. Just rename process to

[Mesa-dev] [PATCH v2 00/49] meson for windows

2018-07-10 Thread Dylan Baker
This is the second spin of my meson for windows series. It fixes a few issues from the first version, and is rebased on current master. The biggest changes are changing shader-cache to a trillian (auto, true, false), changing the lib names to match the scons names, and fixing process.h interfering

[Mesa-dev] [PATCH v2 10/49] meson: build getopt when using msvc

2018-07-10 Thread Dylan Baker
completely untested --- src/getopt/meson.build | 29 + src/meson.build| 5 + 2 files changed, 34 insertions(+) create mode 100644 src/getopt/meson.build diff --git a/src/getopt/meson.build b/src/getopt/meson.build new file mode 100644 index 000..5

[Mesa-dev] [PATCH v2 08/49] glsl: fix general_ir_test with mingw

2018-07-10 Thread Dylan Baker
Somewhere down in the depths of the mingw headers 'interface' is defined, change it to iface like a similar patch did. --- src/compiler/glsl/tests/general_ir_test.cpp | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/compiler/glsl/tests/general_ir_test.cpp b/s

[Mesa-dev] [PATCH v2 04/49] meson: add a zlib subproject

2018-07-10 Thread Dylan Baker
To help windows build --- meson.build | 2 +- subprojects/zlib.wrap | 10 ++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 subprojects/zlib.wrap diff --git a/meson.build b/meson.build index 7d12af3d510..26f1c48563b 100644 --- a/meson.build +++ b/meson.bui

[Mesa-dev] [PATCH v2 06/49] gallium: fix ddebug on windows

2018-07-10 Thread Dylan Baker
By including the proper headers for getpid and for mkdir. Signed-off-by: Dylan Baker Reviewed-by: Marek Olšák --- src/gallium/auxiliary/driver_ddebug/dd_util.h | 6 +- src/gallium/auxiliary/meson.build | 6 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sr

[Mesa-dev] [PATCH v2 02/49] meson: always define libglapi

2018-07-10 Thread Dylan Baker
This allows the identifier to be used even if shared-glapi isn't build, which simplifies a bunch of things. --- src/mapi/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mapi/meson.build b/src/mapi/meson.build index 798586bfb0c..0be80047e4d 100644 --- a/src/mapi/meson.build ++

[Mesa-dev] [PATCH v2 07/49] glapi: export glapi_destroy_multithread when building shared-glapi on windows

2018-07-10 Thread Dylan Baker
Which will allow meson to build a shared glapi build with mingw. --- src/mapi/glapi/glapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h index d5d4e0a03a6..cbdef2e4c5a 100644 --- a/src/mapi/glapi/glapi.h +++ b/src/mapi/glapi/gl

[Mesa-dev] [PATCH v2 22/49] meson: fix gallium-osmesa to build for windows

2018-07-10 Thread Dylan Baker
v2: - set so_version to '' (only affects windows) - always set lib prefix to 'lib', even on msvc --- src/gallium/state_trackers/osmesa/meson.build | 12 ++-- src/gallium/targets/osmesa/meson.build| 11 ++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/

[Mesa-dev] [PATCH v2 09/49] meson: fix dl detection on non cygwin windows

2018-07-10 Thread Dylan Baker
--- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index c317851b0c6..40c59f13f1e 100644 --- a/meson.build +++ b/meson.build @@ -1027,9 +1027,9 @@ endif if cc.has_function('dlopen') dep_dl = null_dep else - dep_dl = cc.find_libra

[Mesa-dev] [PATCH v2 18/49] meson: build gallium gdi winsys

2018-07-10 Thread Dylan Baker
--- src/gallium/meson.build | 6 ++ src/gallium/winsys/sw/gdi/meson.build | 27 +++ 2 files changed, 33 insertions(+) create mode 100644 src/gallium/winsys/sw/gdi/meson.build diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 561af9d33

[Mesa-dev] [PATCH v2 05/49] meson: add a expat subproject

2018-07-10 Thread Dylan Baker
--- meson.build| 2 +- subprojects/expat.wrap | 10 ++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 subprojects/expat.wrap diff --git a/meson.build b/meson.build index 26f1c48563b..c317851b0c6 100644 --- a/meson.build +++ b/meson.build @@ -1064,7 +1064

[Mesa-dev] [PATCH v2 17/49] meson: Add necessary defines for mesa_gallium on windows

2018-07-10 Thread Dylan Baker
--- src/mesa/meson.build | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 8fb7db215c8..37baff51cfd 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -726,11 +726,19 @@ libmesa_classic = static_library(

[Mesa-dev] [PATCH v2 13/49] meson: don't allow glvnd on windows

2018-07-10 Thread Dylan Baker
--- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f29ffd65035..4f4d4cf61bb 100644 --- a/meson.build +++ b/meson.build @@ -356,7 +356,9 @@ endif with_glvnd = get_option('glvnd') if with_glvnd - if with_glx == 'xlib' or with_g

[Mesa-dev] [PATCH v2 11/49] meson: Add a platform for windows

2018-07-10 Thread Dylan Baker
This mirrors the haiku build which uses a platform. v2: - Fix some rebase problems --- meson.build | 8 ++-- meson_options.txt | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 40c59f13f1e..ce3b3406510 100644 --- a/meson.build +++ b/me

[Mesa-dev] [PATCH v2 03/49] add a git ignore for subprojects

2018-07-10 Thread Dylan Baker
--- subprojects/.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 subprojects/.gitignore diff --git a/subprojects/.gitignore b/subprojects/.gitignore new file mode 100644 index 000..68a882edba6 --- /dev/null +++ b/subprojects/.gitignore @@ -0,0 +1,3 @@ +* +!*.wrap +!

[Mesa-dev] [PATCH v2 27/49] meson: fix pipe-loader compilation for windows

2018-07-10 Thread Dylan Baker
v2: - Add missing D to pound define - Simply define the variable rather than set it to 1 (mirrors android.mk not scons) --- src/gallium/auxiliary/pipe-loader/meson.build | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/pipe-loader/meson.b

[Mesa-dev] [PATCH v2 20/49] meson: build libgl-gdi target

2018-07-10 Thread Dylan Baker
--- src/gallium/meson.build | 1 + src/gallium/targets/libgl-gdi/meson.build | 44 +++ 2 files changed, 45 insertions(+) create mode 100644 src/gallium/targets/libgl-gdi/meson.build diff --git a/src/gallium/meson.build b/src/gallium/meson.build index a4f28d

[Mesa-dev] [PATCH v2 32/49] meson: disable sse4.1 optimizations with msvc

2018-07-10 Thread Dylan Baker
There isn't an obvious command line switch here, /arch:AVX *might* be the right thing, but meson doesn't know what to do here either and leaves the -msse4.1 and -mstackrealign. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4a57c

[Mesa-dev] [PATCH v2 12/49] meson: don't build glx or dri by default on windows

2018-07-10 Thread Dylan Baker
--- meson.build | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index ce3b3406510..f29ffd65035 100644 --- a/meson.build +++ b/meson.build @@ -264,8 +264,12 @@ if with_glx == 'auto' elif with_platform_haiku with_glx = 'disabled' elif

[Mesa-dev] [PATCH v2 29/49] meson: Add support for using win_flex and win_bison on windows

2018-07-10 Thread Dylan Baker
--- meson.build | 27 +-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 03b37708ee2..164917eae1a 100644 --- a/meson.build +++ b/meson.build @@ -1311,8 +1311,31 @@ endif # pthread stubs. Lets not and say we didn't -prog_b

[Mesa-dev] [PATCH v2 42/49] meson: Fix gtest linkage on msvc

2018-07-10 Thread Dylan Baker
We need to add an extra flag (/SUBSYSTEM:CONSOLE) to get the msvc linker to find main() in a static library. --- src/gtest/meson.build | 7 +++ 1 file changed, 7 insertions(+) diff --git a/src/gtest/meson.build b/src/gtest/meson.build index 91a49240416..ed0d6974bd3 100644 --- a/src/gtest/meso

[Mesa-dev] [PATCH v2 16/49] meson: Add windows defines to glapi

2018-07-10 Thread Dylan Baker
These are needed to control the export or symbols due to differences between the way windows and *nix handle symbol exports. --- src/mapi/es1api/meson.build | 10 +- src/mapi/es2api/meson.build | 10 +- src/mapi/glapi/meson.build| 13 - src/mapi/shar

[Mesa-dev] [PATCH v2 14/49] meson: add windows compiler checks and libraries

2018-07-10 Thread Dylan Baker
--- meson.build | 129 1 file changed, 79 insertions(+), 50 deletions(-) diff --git a/meson.build b/meson.build index 4f4d4cf61bb..ceda8af562b 100644 --- a/meson.build +++ b/meson.build @@ -775,69 +775,96 @@ endif # TODO: this is very incomple

[Mesa-dev] [PATCH v2 21/49] meson: build graw-gdi target

2018-07-10 Thread Dylan Baker
--- src/gallium/meson.build | 4 ++- src/gallium/targets/graw-gdi/meson.build | 36 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/gallium/targets/graw-gdi/meson.build diff --git a/src/gallium/meson.build b/src/gallium/meson.bui

[Mesa-dev] [PATCH v2 19/49] meson: build wgl state tracker

2018-07-10 Thread Dylan Baker
--- src/gallium/meson.build| 3 ++ src/gallium/state_trackers/wgl/meson.build | 50 ++ 2 files changed, 53 insertions(+) create mode 100644 src/gallium/state_trackers/wgl/meson.build diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 775

[Mesa-dev] [PATCH v2 36/49] util/tests: Use define instead of VLA

2018-07-10 Thread Dylan Baker
To allow the this test to be built with MSVC, which doesn't support VLAs. --- src/util/tests/hash_table/clear.c | 13 +++-- src/util/tests/hash_table/delete_management.c | 13 +++-- src/util/tests/hash_table/insert_many.c | 11 ++- src/util/tests/hash_tabl

[Mesa-dev] [PATCH v2 25/49] docs/meson.html: fix numerous issues spotted by xmllint

2018-07-10 Thread Dylan Baker
--- docs/meson.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/meson.html b/docs/meson.html index b64ca2ec35e..d4b1861ff26 100644 --- a/docs/meson.html +++ b/docs/meson.html @@ -1,9 +1,9 @@ http://www.w3.org/TR/html4/loose.dtd";> - + Compilation and I

[Mesa-dev] [PATCH v2 30/49] meson: make nm binary optional

2018-07-10 Thread Dylan Baker
This makes nm not required, but used if found. In general I imagine that this means that on windows nm wont be found, and on other platforms it will. v2: - fix gbm and egl symbols check tests to only be run if nm is found - reword commit message to reflect the code change --- meson.build

[Mesa-dev] [PATCH v2 37/49] meson: Don't build glsl cache_test for windows

2018-07-10 Thread Dylan Baker
v2: - Use new with_shader_cache variable instead of host_machine.system() == 'windows' --- src/compiler/glsl/tests/meson.build | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.buil

[Mesa-dev] [PATCH v2 23/49] meson: Don't check for posix_memalign on windows

2018-07-10 Thread Dylan Baker
There's a mingw bug for this, it exports __builtin_posix_memalign but not posix_memalign, so the check will succeed, but compiling will fail. --- meson.build | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 756c2dad083..9d9adffac4b

[Mesa-dev] [PATCH v2 28/49] meson: don't look for rt on windows

2018-07-10 Thread Dylan Baker
--- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 12b4811c953..03b37708ee2 100644 --- a/meson.build +++ b/meson.build @@ -1101,7 +1101,9 @@ elif with_dri_i965 and get_option('shader-cache') endif # Determine whether or not th

[Mesa-dev] [PATCH v2 35/49] meson: Add idep_getopt for tests

2018-07-10 Thread Dylan Baker
There are quite a few tests that require getopt, when using MSVC we need to use the bundled version of getopt since there isn't a system version. --- src/compiler/glsl/glcpp/meson.build | 2 +- src/compiler/glsl/meson.build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff -

[Mesa-dev] [PATCH v2 43/49] meson: disable graw tests on mingw

2018-07-10 Thread Dylan Baker
I can't figure out why symbols are being exposed that shouldn't. --- src/gallium/tests/meson.build | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/tests/meson.build b/src/gallium/tests/meson.build index 15b9f549647..1d08da2ac10 100644 --- a/src/gallium/tests/me

[Mesa-dev] [PATCH v2 26/49] util/xmlconfig: include strndup.h for windows

2018-07-10 Thread Dylan Baker
--- src/util/xmlconfig.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c index ba657294c1c..e204e52b71d 100644 --- a/src/util/xmlconfig.c +++ b/src/util/xmlconfig.c @@ -36,6 +36,7 @@ #include #include #include +#include "strndup.h" #include "x

[Mesa-dev] [PATCH v2 47/49] appveyor: use chocolatey (cinst) to install winflexbison

2018-07-10 Thread Dylan Baker
v2: - fix typos in commit message --- appveyor.yml | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bdf1ba8388a..ee08786685a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,13 +34,11 @@ branches: clone_depth: 100 cache: -- win_flex_

[Mesa-dev] [PATCH v2 39/49] nir/meson: fix c vs cpp args for nir test

2018-07-10 Thread Dylan Baker
Fixes: d1992255bb29054fa51763376d125183a9f602f3 ("meson: Add build Intel "anv" vulkan driver") Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom --- src/compiler/nir/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/nir/meson.build b/src/com

[Mesa-dev] [PATCH v2 48/49] tests/vma: fix build with MSVC

2018-07-10 Thread Dylan Baker
--- src/util/tests/vma/vma_random_test.cpp | 8 1 file changed, 8 insertions(+) diff --git a/src/util/tests/vma/vma_random_test.cpp b/src/util/tests/vma/vma_random_test.cpp index 1f194fcdf92..9246176cbf2 100644 --- a/src/util/tests/vma/vma_random_test.cpp +++ b/src/util/tests/vma/vma_ra

[Mesa-dev] [PATCH v2 38/49] glsl/tests: define ssize_t on windows

2018-07-10 Thread Dylan Baker
--- src/compiler/glsl/tests/blob_test.c | 4 1 file changed, 4 insertions(+) diff --git a/src/compiler/glsl/tests/blob_test.c b/src/compiler/glsl/tests/blob_test.c index 1cc97236e7e..21b8b1efdc1 100644 --- a/src/compiler/glsl/tests/blob_test.c +++ b/src/compiler/glsl/tests/blob_test.c @@ -2

[Mesa-dev] [PATCH v2 40/49] meson: Set visibility and compat args for graw

2018-07-10 Thread Dylan Baker
--- src/gallium/targets/graw-gdi/meson.build | 1 + src/gallium/targets/graw-null/meson.build | 2 ++ src/gallium/targets/graw-xlib/meson.build | 1 + 3 files changed, 4 insertions(+) diff --git a/src/gallium/targets/graw-gdi/meson.build b/src/gallium/targets/graw-gdi/meson.build index e04b454a

[Mesa-dev] [PATCH v2 33/49] meson: add switches for SWR with MSVC

2018-07-10 Thread Dylan Baker
--- src/gallium/drivers/swr/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build index b95c8bc1bf8..ec4d80e4bb2 100644 --- a/src/gallium/drivers/swr/meson.build +++ b/src/gallium/drivers/swr/mes

[Mesa-dev] [PATCH v2 49/49] meson: maintain names of shared API libraries

2018-07-10 Thread Dylan Baker
Mesa uses the lib prefix, and doesn't use a version for it's dynamic libraries, which meson defaults to. v2: - this patch --- src/mapi/es1api/meson.build | 2 ++ src/mapi/es2api/meson.build | 2 ++ src/mapi/shared-glapi/meson.build | 2 ++ 3 files changed, 6 insertions(+) diff --git

[Mesa-dev] [PATCH v2 15/49] meson: Make shader-cache a trillean instead of boolean

2018-07-10 Thread Dylan Baker
So that it can be implicitly disabled on windows, where it doesn't compile. v2: - Use an auto-option rather than automagic. - fix shader_cache check (== -> !=) --- meson.build | 16 +--- meson_options.txt | 5 +++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --

[Mesa-dev] [PATCH v2 46/49] appveyor: Add support for meson as well as scons

2018-07-10 Thread Dylan Baker
--- appveyor.yml | 28 +++- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 86440f0d76a..bdf1ba8388a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,6 +42,9 @@ os: Visual Studio 2015 environment: WINFLEXBISON_ARCHIVE:

[Mesa-dev] [PATCH v2 41/49] meosn: don't build gallium trivial tests on windows

2018-07-10 Thread Dylan Baker
They require the pipe-loaders, which require xmlconfig, which doesn't build with msvc. --- src/gallium/tests/meson.build | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/tests/meson.build b/src/gallium/tests/meson.build index 0ee04350c87..15b9f549647 100644 --- a

[Mesa-dev] [PATCH v2 44/49] meson: don't build or run mesa-sha1 test on windows

2018-07-10 Thread Dylan Baker
It crashes hard (pop-up window and all). --- src/util/meson.build | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/util/meson.build b/src/util/meson.build index 27a6fc118e5..27e1fae41a9 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -1

  1   2   >