Re: [Mesa-dev] [PATCH 10/25] mesa/nir/radv/anv: add shader_info param to nir_shader builder
On Tue, Oct 18, 2016 at 2:18 PM, Jason Ekstrandwrote: > > > On Tue, Oct 18, 2016 at 2:06 PM, Timothy Arceri < > timothy.arc...@collabora.com> wrote: > >> On Tue, 2016-10-18 at 08:47 -0700, Jason Ekstrand wrote: >> > On Mon, Oct 17, 2016 at 11:12 PM, Timothy Arceri > > abora.com> wrote: >> > > And pass in a pointer to the shader info in gl_program for ARB >> > > programs. >> > > --- >> > > src/amd/vulkan/radv_meta_blit.c | 12 >> > > src/amd/vulkan/radv_meta_blit2d.c | 12 >> > > src/amd/vulkan/radv_meta_buffer.c | 6 -- >> > > src/amd/vulkan/radv_meta_bufimage.c | 3 ++- >> > > src/amd/vulkan/radv_meta_clear.c | 12 >> > > src/amd/vulkan/radv_meta_decompress.c | 6 -- >> > > src/amd/vulkan/radv_meta_fast_clear.c | 6 -- >> > > src/amd/vulkan/radv_meta_resolve.c| 6 -- >> > > src/amd/vulkan/radv_meta_resolve_cs.c | 2 +- >> > > src/amd/vulkan/radv_pipeline.c| 2 +- >> > > src/compiler/nir/nir_builder.h| 5 +++-- >> > > src/compiler/nir/tests/control_flow_tests.cpp | 3 ++- >> > > src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +- >> > > src/intel/blorp/blorp_blit.c | 2 +- >> > > src/intel/blorp/blorp_clear.c | 2 +- >> > > src/mesa/drivers/dri/i965/brw_program.c | 2 +- >> > > src/mesa/drivers/dri/i965/brw_program.h | 2 +- >> > > src/mesa/drivers/dri/i965/brw_tcs.c | 3 ++- >> > > src/mesa/program/prog_to_nir.c| 5 +++-- >> > > src/mesa/program/prog_to_nir.h| 2 +- >> > > 20 files changed, 60 insertions(+), 35 deletions(-) >> > > >> > > diff --git a/src/amd/vulkan/radv_meta_blit.c >> > > b/src/amd/vulkan/radv_meta_blit.c >> > > index bfbf880..3eda43e 100644 >> > > --- a/src/amd/vulkan/radv_meta_blit.c >> > > +++ b/src/amd/vulkan/radv_meta_blit.c >> > > @@ -37,7 +37,8 @@ build_nir_vertex_shader(void) >> > > const struct glsl_type *vec4 = glsl_vec4_type(); >> > > nir_builder b; >> > > >> > > - nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_VERTEX, NULL); >> > > + nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_VERTEX, NULL, >> > > + NULL); >> > > b.shader->info->name = ralloc_strdup(b.shader, >> > > "meta_blit_vs"); >> > > >> > > nir_variable *pos_in = nir_variable_create(b.shader, >> > > nir_var_shader_in, >> > > @@ -67,7 +68,8 @@ build_nir_copy_fragment_shader(enum >> > > glsl_sampler_dim tex_dim) >> > > const struct glsl_type *vec4 = glsl_vec4_type(); >> > > nir_builder b; >> > > >> > > - nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_FRAGMENT, NULL); >> > > + nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_FRAGMENT, NULL, >> > > + NULL); >> > > >> > > sprintf(shader_name, "meta_blit_fs.%d", tex_dim); >> > > b.shader->info->name = ralloc_strdup(b.shader, >> > > shader_name); >> > > @@ -121,7 +123,8 @@ build_nir_copy_fragment_shader_depth(enum >> > > glsl_sampler_dim tex_dim) >> > > const struct glsl_type *vec4 = glsl_vec4_type(); >> > > nir_builder b; >> > > >> > > - nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_FRAGMENT, NULL); >> > > + nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_FRAGMENT, NULL, >> > > + NULL); >> > > >> > > sprintf(shader_name, "meta_blit_depth_fs.%d", tex_dim); >> > > b.shader->info->name = ralloc_strdup(b.shader, >> > > shader_name); >> > > @@ -175,7 +178,8 @@ build_nir_copy_fragment_shader_stencil(enum >> > > glsl_sampler_dim tex_dim) >> > > const struct glsl_type *vec4 = glsl_vec4_type(); >> > > nir_builder b; >> > > >> > > - nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_FRAGMENT, NULL); >> > > + nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_FRAGMENT, NULL, >> > > + NULL); >> > > >> > > sprintf(shader_name, "meta_blit_stencil_fs.%d", tex_dim); >> > > b.shader->info->name = ralloc_strdup(b.shader, >> > > shader_name); >> > > diff --git a/src/amd/vulkan/radv_meta_blit2d.c >> > > b/src/amd/vulkan/radv_meta_blit2d.c >> > > index 6e92f80..bed03a3 100644 >> > > --- a/src/amd/vulkan/radv_meta_blit2d.c >> > > +++ b/src/amd/vulkan/radv_meta_blit2d.c >> > > @@ -438,7 +438,8 @@ build_nir_vertex_shader(void) >> > > const struct glsl_type *vec2 = >> > > glsl_vector_type(GLSL_TYPE_FLOAT, 2); >> > > nir_builder b; >> > > >> > > - nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_VERTEX, NULL); >> > > + nir_builder_init_simple_shader(, NULL, >> > > MESA_SHADER_VERTEX, NULL, >> > > +
Re: [Mesa-dev] [PATCH 10/25] mesa/nir/radv/anv: add shader_info param to nir_shader builder
On Tue, Oct 18, 2016 at 2:06 PM, Timothy Arceri < timothy.arc...@collabora.com> wrote: > On Tue, 2016-10-18 at 08:47 -0700, Jason Ekstrand wrote: > > On Mon, Oct 17, 2016 at 11:12 PM, Timothy Arceri> abora.com> wrote: > > > And pass in a pointer to the shader info in gl_program for ARB > > > programs. > > > --- > > > src/amd/vulkan/radv_meta_blit.c | 12 > > > src/amd/vulkan/radv_meta_blit2d.c | 12 > > > src/amd/vulkan/radv_meta_buffer.c | 6 -- > > > src/amd/vulkan/radv_meta_bufimage.c | 3 ++- > > > src/amd/vulkan/radv_meta_clear.c | 12 > > > src/amd/vulkan/radv_meta_decompress.c | 6 -- > > > src/amd/vulkan/radv_meta_fast_clear.c | 6 -- > > > src/amd/vulkan/radv_meta_resolve.c| 6 -- > > > src/amd/vulkan/radv_meta_resolve_cs.c | 2 +- > > > src/amd/vulkan/radv_pipeline.c| 2 +- > > > src/compiler/nir/nir_builder.h| 5 +++-- > > > src/compiler/nir/tests/control_flow_tests.cpp | 3 ++- > > > src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +- > > > src/intel/blorp/blorp_blit.c | 2 +- > > > src/intel/blorp/blorp_clear.c | 2 +- > > > src/mesa/drivers/dri/i965/brw_program.c | 2 +- > > > src/mesa/drivers/dri/i965/brw_program.h | 2 +- > > > src/mesa/drivers/dri/i965/brw_tcs.c | 3 ++- > > > src/mesa/program/prog_to_nir.c| 5 +++-- > > > src/mesa/program/prog_to_nir.h| 2 +- > > > 20 files changed, 60 insertions(+), 35 deletions(-) > > > > > > diff --git a/src/amd/vulkan/radv_meta_blit.c > > > b/src/amd/vulkan/radv_meta_blit.c > > > index bfbf880..3eda43e 100644 > > > --- a/src/amd/vulkan/radv_meta_blit.c > > > +++ b/src/amd/vulkan/radv_meta_blit.c > > > @@ -37,7 +37,8 @@ build_nir_vertex_shader(void) > > > const struct glsl_type *vec4 = glsl_vec4_type(); > > > nir_builder b; > > > > > > - nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_VERTEX, NULL); > > > + nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_VERTEX, NULL, > > > + NULL); > > > b.shader->info->name = ralloc_strdup(b.shader, > > > "meta_blit_vs"); > > > > > > nir_variable *pos_in = nir_variable_create(b.shader, > > > nir_var_shader_in, > > > @@ -67,7 +68,8 @@ build_nir_copy_fragment_shader(enum > > > glsl_sampler_dim tex_dim) > > > const struct glsl_type *vec4 = glsl_vec4_type(); > > > nir_builder b; > > > > > > - nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_FRAGMENT, NULL); > > > + nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_FRAGMENT, NULL, > > > + NULL); > > > > > > sprintf(shader_name, "meta_blit_fs.%d", tex_dim); > > > b.shader->info->name = ralloc_strdup(b.shader, > > > shader_name); > > > @@ -121,7 +123,8 @@ build_nir_copy_fragment_shader_depth(enum > > > glsl_sampler_dim tex_dim) > > > const struct glsl_type *vec4 = glsl_vec4_type(); > > > nir_builder b; > > > > > > - nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_FRAGMENT, NULL); > > > + nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_FRAGMENT, NULL, > > > + NULL); > > > > > > sprintf(shader_name, "meta_blit_depth_fs.%d", tex_dim); > > > b.shader->info->name = ralloc_strdup(b.shader, > > > shader_name); > > > @@ -175,7 +178,8 @@ build_nir_copy_fragment_shader_stencil(enum > > > glsl_sampler_dim tex_dim) > > > const struct glsl_type *vec4 = glsl_vec4_type(); > > > nir_builder b; > > > > > > - nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_FRAGMENT, NULL); > > > + nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_FRAGMENT, NULL, > > > + NULL); > > > > > > sprintf(shader_name, "meta_blit_stencil_fs.%d", tex_dim); > > > b.shader->info->name = ralloc_strdup(b.shader, > > > shader_name); > > > diff --git a/src/amd/vulkan/radv_meta_blit2d.c > > > b/src/amd/vulkan/radv_meta_blit2d.c > > > index 6e92f80..bed03a3 100644 > > > --- a/src/amd/vulkan/radv_meta_blit2d.c > > > +++ b/src/amd/vulkan/radv_meta_blit2d.c > > > @@ -438,7 +438,8 @@ build_nir_vertex_shader(void) > > > const struct glsl_type *vec2 = > > > glsl_vector_type(GLSL_TYPE_FLOAT, 2); > > > nir_builder b; > > > > > > - nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_VERTEX, NULL); > > > + nir_builder_init_simple_shader(, NULL, > > > MESA_SHADER_VERTEX, NULL, > > > + NULL); > > > b.shader->info->name = ralloc_strdup(b.shader, > > > "meta_blit_vs"); > > > > > > nir_variable *pos_in = nir_variable_create(b.shader, > > > nir_var_shader_in, > >
Re: [Mesa-dev] [PATCH 10/25] mesa/nir/radv/anv: add shader_info param to nir_shader builder
On Tue, 2016-10-18 at 08:47 -0700, Jason Ekstrand wrote: > On Mon, Oct 17, 2016 at 11:12 PM, Timothy Arceriabora.com> wrote: > > And pass in a pointer to the shader info in gl_program for ARB > > programs. > > --- > > src/amd/vulkan/radv_meta_blit.c | 12 > > src/amd/vulkan/radv_meta_blit2d.c | 12 > > src/amd/vulkan/radv_meta_buffer.c | 6 -- > > src/amd/vulkan/radv_meta_bufimage.c | 3 ++- > > src/amd/vulkan/radv_meta_clear.c | 12 > > src/amd/vulkan/radv_meta_decompress.c | 6 -- > > src/amd/vulkan/radv_meta_fast_clear.c | 6 -- > > src/amd/vulkan/radv_meta_resolve.c | 6 -- > > src/amd/vulkan/radv_meta_resolve_cs.c | 2 +- > > src/amd/vulkan/radv_pipeline.c | 2 +- > > src/compiler/nir/nir_builder.h | 5 +++-- > > src/compiler/nir/tests/control_flow_tests.cpp | 3 ++- > > src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +- > > src/intel/blorp/blorp_blit.c | 2 +- > > src/intel/blorp/blorp_clear.c | 2 +- > > src/mesa/drivers/dri/i965/brw_program.c | 2 +- > > src/mesa/drivers/dri/i965/brw_program.h | 2 +- > > src/mesa/drivers/dri/i965/brw_tcs.c | 3 ++- > > src/mesa/program/prog_to_nir.c | 5 +++-- > > src/mesa/program/prog_to_nir.h | 2 +- > > 20 files changed, 60 insertions(+), 35 deletions(-) > > > > diff --git a/src/amd/vulkan/radv_meta_blit.c > > b/src/amd/vulkan/radv_meta_blit.c > > index bfbf880..3eda43e 100644 > > --- a/src/amd/vulkan/radv_meta_blit.c > > +++ b/src/amd/vulkan/radv_meta_blit.c > > @@ -37,7 +37,8 @@ build_nir_vertex_shader(void) > > const struct glsl_type *vec4 = glsl_vec4_type(); > > nir_builder b; > > > > - nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_VERTEX, NULL); > > + nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_VERTEX, NULL, > > + NULL); > > b.shader->info->name = ralloc_strdup(b.shader, > > "meta_blit_vs"); > > > > nir_variable *pos_in = nir_variable_create(b.shader, > > nir_var_shader_in, > > @@ -67,7 +68,8 @@ build_nir_copy_fragment_shader(enum > > glsl_sampler_dim tex_dim) > > const struct glsl_type *vec4 = glsl_vec4_type(); > > nir_builder b; > > > > - nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_FRAGMENT, NULL); > > + nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_FRAGMENT, NULL, > > + NULL); > > > > sprintf(shader_name, "meta_blit_fs.%d", tex_dim); > > b.shader->info->name = ralloc_strdup(b.shader, > > shader_name); > > @@ -121,7 +123,8 @@ build_nir_copy_fragment_shader_depth(enum > > glsl_sampler_dim tex_dim) > > const struct glsl_type *vec4 = glsl_vec4_type(); > > nir_builder b; > > > > - nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_FRAGMENT, NULL); > > + nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_FRAGMENT, NULL, > > + NULL); > > > > sprintf(shader_name, "meta_blit_depth_fs.%d", tex_dim); > > b.shader->info->name = ralloc_strdup(b.shader, > > shader_name); > > @@ -175,7 +178,8 @@ build_nir_copy_fragment_shader_stencil(enum > > glsl_sampler_dim tex_dim) > > const struct glsl_type *vec4 = glsl_vec4_type(); > > nir_builder b; > > > > - nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_FRAGMENT, NULL); > > + nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_FRAGMENT, NULL, > > + NULL); > > > > sprintf(shader_name, "meta_blit_stencil_fs.%d", tex_dim); > > b.shader->info->name = ralloc_strdup(b.shader, > > shader_name); > > diff --git a/src/amd/vulkan/radv_meta_blit2d.c > > b/src/amd/vulkan/radv_meta_blit2d.c > > index 6e92f80..bed03a3 100644 > > --- a/src/amd/vulkan/radv_meta_blit2d.c > > +++ b/src/amd/vulkan/radv_meta_blit2d.c > > @@ -438,7 +438,8 @@ build_nir_vertex_shader(void) > > const struct glsl_type *vec2 = > > glsl_vector_type(GLSL_TYPE_FLOAT, 2); > > nir_builder b; > > > > - nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_VERTEX, NULL); > > + nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_VERTEX, NULL, > > + NULL); > > b.shader->info->name = ralloc_strdup(b.shader, > > "meta_blit_vs"); > > > > nir_variable *pos_in = nir_variable_create(b.shader, > > nir_var_shader_in, > > @@ -573,7 +574,8 @@ build_nir_copy_fragment_shader(struct > > radv_device *device, > > const struct glsl_type *vec2 = > > glsl_vector_type(GLSL_TYPE_FLOAT, 2); > > nir_builder b; > > > > - nir_builder_init_simple_shader(, NULL, > > MESA_SHADER_FRAGMENT, NULL); > > +
Re: [Mesa-dev] [PATCH 10/25] mesa/nir/radv/anv: add shader_info param to nir_shader builder
On Mon, Oct 17, 2016 at 11:12 PM, Timothy Arceri < timothy.arc...@collabora.com> wrote: > And pass in a pointer to the shader info in gl_program for ARB programs. > --- > src/amd/vulkan/radv_meta_blit.c | 12 > src/amd/vulkan/radv_meta_blit2d.c | 12 > src/amd/vulkan/radv_meta_buffer.c | 6 -- > src/amd/vulkan/radv_meta_bufimage.c | 3 ++- > src/amd/vulkan/radv_meta_clear.c | 12 > src/amd/vulkan/radv_meta_decompress.c | 6 -- > src/amd/vulkan/radv_meta_fast_clear.c | 6 -- > src/amd/vulkan/radv_meta_resolve.c| 6 -- > src/amd/vulkan/radv_meta_resolve_cs.c | 2 +- > src/amd/vulkan/radv_pipeline.c| 2 +- > src/compiler/nir/nir_builder.h| 5 +++-- > src/compiler/nir/tests/control_flow_tests.cpp | 3 ++- > src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +- > src/intel/blorp/blorp_blit.c | 2 +- > src/intel/blorp/blorp_clear.c | 2 +- > src/mesa/drivers/dri/i965/brw_program.c | 2 +- > src/mesa/drivers/dri/i965/brw_program.h | 2 +- > src/mesa/drivers/dri/i965/brw_tcs.c | 3 ++- > src/mesa/program/prog_to_nir.c| 5 +++-- > src/mesa/program/prog_to_nir.h| 2 +- > 20 files changed, 60 insertions(+), 35 deletions(-) > > diff --git a/src/amd/vulkan/radv_meta_blit.c > b/src/amd/vulkan/radv_meta_blit.c > index bfbf880..3eda43e 100644 > --- a/src/amd/vulkan/radv_meta_blit.c > +++ b/src/amd/vulkan/radv_meta_blit.c > @@ -37,7 +37,8 @@ build_nir_vertex_shader(void) > const struct glsl_type *vec4 = glsl_vec4_type(); > nir_builder b; > > - nir_builder_init_simple_shader(, NULL, MESA_SHADER_VERTEX, > NULL); > + nir_builder_init_simple_shader(, NULL, MESA_SHADER_VERTEX, NULL, > + NULL); > b.shader->info->name = ralloc_strdup(b.shader, "meta_blit_vs"); > > nir_variable *pos_in = nir_variable_create(b.shader, > nir_var_shader_in, > @@ -67,7 +68,8 @@ build_nir_copy_fragment_shader(enum glsl_sampler_dim > tex_dim) > const struct glsl_type *vec4 = glsl_vec4_type(); > nir_builder b; > > - nir_builder_init_simple_shader(, NULL, MESA_SHADER_FRAGMENT, > NULL); > + nir_builder_init_simple_shader(, NULL, MESA_SHADER_FRAGMENT, > NULL, > + NULL); > > sprintf(shader_name, "meta_blit_fs.%d", tex_dim); > b.shader->info->name = ralloc_strdup(b.shader, shader_name); > @@ -121,7 +123,8 @@ build_nir_copy_fragment_shader_depth(enum > glsl_sampler_dim tex_dim) > const struct glsl_type *vec4 = glsl_vec4_type(); > nir_builder b; > > - nir_builder_init_simple_shader(, NULL, MESA_SHADER_FRAGMENT, > NULL); > + nir_builder_init_simple_shader(, NULL, MESA_SHADER_FRAGMENT, > NULL, > + NULL); > > sprintf(shader_name, "meta_blit_depth_fs.%d", tex_dim); > b.shader->info->name = ralloc_strdup(b.shader, shader_name); > @@ -175,7 +178,8 @@ build_nir_copy_fragment_shader_stencil(enum > glsl_sampler_dim tex_dim) > const struct glsl_type *vec4 = glsl_vec4_type(); > nir_builder b; > > - nir_builder_init_simple_shader(, NULL, MESA_SHADER_FRAGMENT, > NULL); > + nir_builder_init_simple_shader(, NULL, MESA_SHADER_FRAGMENT, > NULL, > + NULL); > > sprintf(shader_name, "meta_blit_stencil_fs.%d", tex_dim); > b.shader->info->name = ralloc_strdup(b.shader, shader_name); > diff --git a/src/amd/vulkan/radv_meta_blit2d.c > b/src/amd/vulkan/radv_meta_blit2d.c > index 6e92f80..bed03a3 100644 > --- a/src/amd/vulkan/radv_meta_blit2d.c > +++ b/src/amd/vulkan/radv_meta_blit2d.c > @@ -438,7 +438,8 @@ build_nir_vertex_shader(void) > const struct glsl_type *vec2 = glsl_vector_type(GLSL_TYPE_FLOAT, > 2); > nir_builder b; > > - nir_builder_init_simple_shader(, NULL, MESA_SHADER_VERTEX, > NULL); > + nir_builder_init_simple_shader(, NULL, MESA_SHADER_VERTEX, NULL, > + NULL); > b.shader->info->name = ralloc_strdup(b.shader, "meta_blit_vs"); > > nir_variable *pos_in = nir_variable_create(b.shader, > nir_var_shader_in, > @@ -573,7 +574,8 @@ build_nir_copy_fragment_shader(struct radv_device > *device, > const struct glsl_type *vec2 = glsl_vector_type(GLSL_TYPE_FLOAT, > 2); > nir_builder b; > > - nir_builder_init_simple_shader(, NULL, MESA_SHADER_FRAGMENT, > NULL); > + nir_builder_init_simple_shader(, NULL, MESA_SHADER_FRAGMENT, > NULL, > + NULL); > b.shader->info->name = ralloc_strdup(b.shader, name); > > nir_variable *tex_pos_in = nir_variable_create(b.shader, > nir_var_shader_in, > @@ -602,7 +604,8 @@