Re: [Mesa-dev] [PATCH 28/64] isl/state: Don't use designated initializers for buffer surface state

2016-06-13 Thread Jason Ekstrand
On Mon, Jun 13, 2016 at 7:53 AM, Jason Ekstrand 
wrote:

>
>
> On Mon, Jun 13, 2016 at 1:50 AM, Emil Velikov 
> wrote:
>
>> Hi Jason,
>>
>> Why do you remove the C99 initializer ? Anything wrong with using it ?
>>
>
> Mostly readability and matching what we did earlier with the other surface
> state struct.
>
>
>>
>> On 11 June 2016 at 17:02, Jason Ekstrand  wrote:
>> > ---
>> >  src/intel/isl/isl_surface_state.c | 46
>> +++
>> >  1 file changed, 23 insertions(+), 23 deletions(-)
>> >
>> > diff --git a/src/intel/isl/isl_surface_state.c
>> b/src/intel/isl/isl_surface_state.c
>> > index ca13175..2026f80 100644
>> > --- a/src/intel/isl/isl_surface_state.c
>> > +++ b/src/intel/isl/isl_surface_state.c
>> > @@ -427,40 +427,40 @@ isl_genX(buffer_fill_state_s)(void *state,
>> >assert(num_elements <= (1ull << 27));
>> > }
>> >
>> > -   struct GENX(RENDER_SURFACE_STATE) surface_state = {
>> > -  .SurfaceType = SURFTYPE_BUFFER,
>> > -  .SurfaceArray = false,
>> > -  .SurfaceFormat = info->format,
>> > -  .SurfaceVerticalAlignment = isl_to_gen_valign[4],
>> > -  .SurfaceHorizontalAlignment = isl_to_gen_halign[4],
>> > -  .Height = ((num_elements - 1) >> 7) & 0x3fff,
>> > -  .Width = (num_elements - 1) & 0x7f,
>> > -  .Depth = ((num_elements - 1) >> 21) & 0x3f,
>> > -  .SurfacePitch = info->stride - 1,
>> > -  .NumberofMultisamples = MULTISAMPLECOUNT_1,
>> > +   struct GENX(RENDER_SURFACE_STATE) s = { 0 };
>> > +
>> > +   s.SurfaceType = SURFTYPE_BUFFER,
>> Are you sure that this patch builds ? Shouldn't we be using semicolon
>> and the end of the above line (plus all the ones below) ?
>>
>
It does build thanks to comma expressions, but it should be fixed!


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


Re: [Mesa-dev] [PATCH 28/64] isl/state: Don't use designated initializers for buffer surface state

2016-06-13 Thread Jason Ekstrand
On Mon, Jun 13, 2016 at 1:50 AM, Emil Velikov 
wrote:

> Hi Jason,
>
> Why do you remove the C99 initializer ? Anything wrong with using it ?
>

Mostly readability and matching what we did earlier with the other surface
state struct.


>
> On 11 June 2016 at 17:02, Jason Ekstrand  wrote:
> > ---
> >  src/intel/isl/isl_surface_state.c | 46
> +++
> >  1 file changed, 23 insertions(+), 23 deletions(-)
> >
> > diff --git a/src/intel/isl/isl_surface_state.c
> b/src/intel/isl/isl_surface_state.c
> > index ca13175..2026f80 100644
> > --- a/src/intel/isl/isl_surface_state.c
> > +++ b/src/intel/isl/isl_surface_state.c
> > @@ -427,40 +427,40 @@ isl_genX(buffer_fill_state_s)(void *state,
> >assert(num_elements <= (1ull << 27));
> > }
> >
> > -   struct GENX(RENDER_SURFACE_STATE) surface_state = {
> > -  .SurfaceType = SURFTYPE_BUFFER,
> > -  .SurfaceArray = false,
> > -  .SurfaceFormat = info->format,
> > -  .SurfaceVerticalAlignment = isl_to_gen_valign[4],
> > -  .SurfaceHorizontalAlignment = isl_to_gen_halign[4],
> > -  .Height = ((num_elements - 1) >> 7) & 0x3fff,
> > -  .Width = (num_elements - 1) & 0x7f,
> > -  .Depth = ((num_elements - 1) >> 21) & 0x3f,
> > -  .SurfacePitch = info->stride - 1,
> > -  .NumberofMultisamples = MULTISAMPLECOUNT_1,
> > +   struct GENX(RENDER_SURFACE_STATE) s = { 0 };
> > +
> > +   s.SurfaceType = SURFTYPE_BUFFER,
> Are you sure that this patch builds ? Shouldn't we be using semicolon
> and the end of the above line (plus all the ones below) ?
>

Rebase fail!


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


Re: [Mesa-dev] [PATCH 28/64] isl/state: Don't use designated initializers for buffer surface state

2016-06-13 Thread Emil Velikov
Hi Jason,

Why do you remove the C99 initializer ? Anything wrong with using it ?

On 11 June 2016 at 17:02, Jason Ekstrand  wrote:
> ---
>  src/intel/isl/isl_surface_state.c | 46 
> +++
>  1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/src/intel/isl/isl_surface_state.c 
> b/src/intel/isl/isl_surface_state.c
> index ca13175..2026f80 100644
> --- a/src/intel/isl/isl_surface_state.c
> +++ b/src/intel/isl/isl_surface_state.c
> @@ -427,40 +427,40 @@ isl_genX(buffer_fill_state_s)(void *state,
>assert(num_elements <= (1ull << 27));
> }
>
> -   struct GENX(RENDER_SURFACE_STATE) surface_state = {
> -  .SurfaceType = SURFTYPE_BUFFER,
> -  .SurfaceArray = false,
> -  .SurfaceFormat = info->format,
> -  .SurfaceVerticalAlignment = isl_to_gen_valign[4],
> -  .SurfaceHorizontalAlignment = isl_to_gen_halign[4],
> -  .Height = ((num_elements - 1) >> 7) & 0x3fff,
> -  .Width = (num_elements - 1) & 0x7f,
> -  .Depth = ((num_elements - 1) >> 21) & 0x3f,
> -  .SurfacePitch = info->stride - 1,
> -  .NumberofMultisamples = MULTISAMPLECOUNT_1,
> +   struct GENX(RENDER_SURFACE_STATE) s = { 0 };
> +
> +   s.SurfaceType = SURFTYPE_BUFFER,
Are you sure that this patch builds ? Shouldn't we be using semicolon
and the end of the above line (plus all the ones below) ?

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


[Mesa-dev] [PATCH 28/64] isl/state: Don't use designated initializers for buffer surface state

2016-06-11 Thread Jason Ekstrand
---
 src/intel/isl/isl_surface_state.c | 46 +++
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/intel/isl/isl_surface_state.c 
b/src/intel/isl/isl_surface_state.c
index ca13175..2026f80 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -427,40 +427,40 @@ isl_genX(buffer_fill_state_s)(void *state,
   assert(num_elements <= (1ull << 27));
}
 
-   struct GENX(RENDER_SURFACE_STATE) surface_state = {
-  .SurfaceType = SURFTYPE_BUFFER,
-  .SurfaceArray = false,
-  .SurfaceFormat = info->format,
-  .SurfaceVerticalAlignment = isl_to_gen_valign[4],
-  .SurfaceHorizontalAlignment = isl_to_gen_halign[4],
-  .Height = ((num_elements - 1) >> 7) & 0x3fff,
-  .Width = (num_elements - 1) & 0x7f,
-  .Depth = ((num_elements - 1) >> 21) & 0x3f,
-  .SurfacePitch = info->stride - 1,
-  .NumberofMultisamples = MULTISAMPLECOUNT_1,
+   struct GENX(RENDER_SURFACE_STATE) s = { 0 };
+
+   s.SurfaceType = SURFTYPE_BUFFER,
+   s.SurfaceArray = false,
+   s.SurfaceFormat = info->format,
+   s.SurfaceVerticalAlignment = isl_to_gen_valign[4],
+   s.SurfaceHorizontalAlignment = isl_to_gen_halign[4],
+   s.Height = ((num_elements - 1) >> 7) & 0x3fff,
+   s.Width = (num_elements - 1) & 0x7f,
+   s.Depth = ((num_elements - 1) >> 21) & 0x3f,
+   s.SurfacePitch = info->stride - 1,
+   s.NumberofMultisamples = MULTISAMPLECOUNT_1,
 
 #if (GEN_GEN >= 8)
-  .TileMode = LINEAR,
+   s.TileMode = LINEAR,
 #else
-  .TiledSurface = false,
+   s.TiledSurface = false,
 #endif
 
 #if (GEN_GEN >= 8)
-  .RenderCacheReadWriteMode = WriteOnlyCache,
+   s.RenderCacheReadWriteMode = WriteOnlyCache,
 #else
-  .RenderCacheReadWriteMode = 0,
+   s.RenderCacheReadWriteMode = 0,
 #endif
 
-  .MOCS = info->mocs,
+   s.SurfaceBaseAddress = info->address,
+   s.MOCS = info->mocs,
 
 #if (GEN_GEN >= 8 || GEN_IS_HASWELL)
-  .ShaderChannelSelectRed = SCS_RED,
-  .ShaderChannelSelectGreen = SCS_GREEN,
-  .ShaderChannelSelectBlue = SCS_BLUE,
-  .ShaderChannelSelectAlpha = SCS_ALPHA,
+   s.ShaderChannelSelectRed = SCS_RED,
+   s.ShaderChannelSelectGreen = SCS_GREEN,
+   s.ShaderChannelSelectBlue = SCS_BLUE,
+   s.ShaderChannelSelectAlpha = SCS_ALPHA,
 #endif
-  .SurfaceBaseAddress = info->address,
-   };
 
-   GENX(RENDER_SURFACE_STATE_pack)(NULL, state, _state);
+   GENX(RENDER_SURFACE_STATE_pack)(NULL, state, );
 }
-- 
2.5.0.400.gff86faf

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