Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-21 Thread Tapani Pälli
On 01/20/2016 09:21 PM, Ian Romanick wrote: So... I'm just going to say that this is commit is the new poster child for not committing something as soon as you get a positive review. This patch went out barely 36 hours ago, and there is already a fix-up patch for it. I have also found two

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-21 Thread Tapani Pälli
On 01/20/2016 06:37 PM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at 6:35 AM, Tapani Pälli wrote: On 01/20/2016 01:11 PM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at 6:02 AM, Tapani Pälli wrote: Unfortunately putting such a shader together is

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Ilia Mirkin
On Wed, Jan 20, 2016 at 6:35 AM, Tapani Pälli wrote: > On 01/20/2016 01:11 PM, Ilia Mirkin wrote: >> >> On Wed, Jan 20, 2016 at 6:02 AM, Tapani Pälli >> wrote: Unfortunately putting such a shader together is a bit of a pain, since

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Ian Romanick
So... I'm just going to say that this is commit is the new poster child for not committing something as soon as you get a positive review. This patch went out barely 36 hours ago, and there is already a fix-up patch for it. I have also found two other issues in review. We're not in that much of

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Ilia Mirkin
On Tue, Jan 19, 2016 at 6:35 AM, Tapani Pälli wrote: > On 01/19/2016 01:14 PM, Ilia Mirkin wrote: >> >> The data structure is a (memory) heap... there appears to be one in >> mesa/main/mm.h. There's also one in nouveau_heap.h which is quite >> simple and totally unreliant

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Tapani Pälli
On 01/20/2016 10:26 AM, Ilia Mirkin wrote: On Tue, Jan 19, 2016 at 6:35 AM, Tapani Pälli wrote: On 01/19/2016 01:14 PM, Ilia Mirkin wrote: The data structure is a (memory) heap... there appears to be one in mesa/main/mm.h. There's also one in nouveau_heap.h which is

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Ilia Mirkin
On Wed, Jan 20, 2016 at 4:09 AM, Tapani Pälli wrote: > On 01/20/2016 10:26 AM, Ilia Mirkin wrote: >> >> On Tue, Jan 19, 2016 at 6:35 AM, Tapani Pälli >> wrote: >>> >>> On 01/19/2016 01:14 PM, Ilia Mirkin wrote: The data structure is a

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Tapani Pälli
On 01/20/2016 11:16 AM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at 4:09 AM, Tapani Pälli wrote: On 01/20/2016 10:26 AM, Ilia Mirkin wrote: On Tue, Jan 19, 2016 at 6:35 AM, Tapani Pälli wrote: On 01/19/2016 01:14 PM, Ilia Mirkin wrote: The

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Ilia Mirkin
On Wed, Jan 20, 2016 at 4:22 AM, Tapani Pälli wrote: > On 01/20/2016 11:16 AM, Ilia Mirkin wrote: >> >> On Wed, Jan 20, 2016 at 4:09 AM, Tapani Pälli >> wrote: >>> >>> On 01/20/2016 10:26 AM, Ilia Mirkin wrote: On Tue, Jan 19, 2016 at

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Ilia Mirkin
On Wed, Jan 20, 2016 at 6:02 AM, Tapani Pälli wrote: >> Unfortunately putting such a shader together is a bit of a pain, since >> all the uniforms have to be used. I still really think you need to >> build a heap. Or at least store a "first empty slot" so that you don't >>

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Ilia Mirkin
On Wed, Jan 20, 2016 at 4:44 AM, Tapani Pälli wrote: > On 01/20/2016 11:31 AM, Ilia Mirkin wrote: >> >> On Wed, Jan 20, 2016 at 4:22 AM, Tapani Pälli >> wrote: >>> >>> On 01/20/2016 11:16 AM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Tapani Pälli
On 01/20/2016 11:31 AM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at 4:22 AM, Tapani Pälli wrote: On 01/20/2016 11:16 AM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at 4:09 AM, Tapani Pälli wrote: On 01/20/2016 10:26 AM, Ilia Mirkin wrote: On Tue,

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Tapani Pälli
On 01/20/2016 12:45 PM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at 4:44 AM, Tapani Pälli wrote: On 01/20/2016 11:31 AM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at 4:22 AM, Tapani Pälli wrote: On 01/20/2016 11:16 AM, Ilia Mirkin wrote: On Wed,

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-20 Thread Tapani Pälli
On 01/20/2016 01:11 PM, Ilia Mirkin wrote: On Wed, Jan 20, 2016 at 6:02 AM, Tapani Pälli wrote: Unfortunately putting such a shader together is a bit of a pain, since all the uniforms have to be used. I still really think you need to build a heap. Or at least store a

[Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-19 Thread Tapani Pälli
Patch moves uniform calculation to happen during link_uniforms, this is possible with help of UniformRemapTable that has all the reserved locations. Location assignment for implicit locations is changed so that we utilize also the 'holes' that explicit uniform location assignment might have left

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-19 Thread Lofstedt, Marta
fst...@intel.com> > -Original Message- > From: mesa-dev [mailto:mesa-dev-boun...@lists.freedesktop.org] On > Behalf Of Tapani Pälli > Sent: Tuesday, January 19, 2016 11:17 AM > To: mesa-dev@lists.freedesktop.org > Subject: [Mesa-dev] [PATCH v2] glsl: move uniform calcul

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-19 Thread Ilia Mirkin
-dev-boun...@lists.freedesktop.org] On >> Behalf Of Tapani Pälli >> Sent: Tuesday, January 19, 2016 11:17 AM >> To: mesa-dev@lists.freedesktop.org >> Subject: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to >> link_uniforms >> >> Pat

Re: [Mesa-dev] [PATCH v2] glsl: move uniform calculation to link_uniforms

2016-01-19 Thread Tapani Pälli
viewed-by: Marta Lofstedt <marta.lofst...@intel.com> -Original Message- From: mesa-dev [mailto:mesa-dev-boun...@lists.freedesktop.org] On Behalf Of Tapani Pälli Sent: Tuesday, January 19, 2016 11:17 AM To: mesa-dev@lists.freedesktop.org Subject: [Mesa-dev] [PATCH v2] glsl: move uniform