On 07/24/2015 12:31 AM, Jason Ekstrand wrote:
> On Thu, Jul 23, 2015 at 3:16 AM, Eduardo Lima Mitev <el...@igalia.com> wrote:
>> The upcoming introduction of NIR->vec4 pass will require that some NIR
>> lowering
>> passes are enabled/disabled depending on the type of shader (scalar vs.
>> vector).
>>
>> With this patch we pass a 'is_scalar' variable to the process of
>> constructing the
>> NIR, to let an external context decide how the shader should be handled.
>> ---
>> src/mesa/drivers/dri/i965/brw_nir.c | 3 ++-
>> src/mesa/drivers/dri/i965/brw_nir.h | 3 ++-
>> src/mesa/drivers/dri/i965/brw_program.c | 6 ++++--
>> src/mesa/drivers/dri/i965/brw_shader.cpp | 6 ++++--
>> src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 +-
>> 5 files changed, 13 insertions(+), 7 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/i965/brw_nir.c
>> b/src/mesa/drivers/dri/i965/brw_nir.c
>> index 3e154c1..4aa893a 100644
>> --- a/src/mesa/drivers/dri/i965/brw_nir.c
>> +++ b/src/mesa/drivers/dri/i965/brw_nir.c
>> @@ -61,7 +61,8 @@ nir_shader *
>> brw_create_nir(struct brw_context *brw,
>> const struct gl_shader_program *shader_prog,
>> const struct gl_program *prog,
>> - gl_shader_stage stage)
>> + gl_shader_stage stage,
>> + bool is_scalar)
>> {
>> struct gl_context *ctx = &brw->ctx;
>> const nir_shader_compiler_options *options =
>> diff --git a/src/mesa/drivers/dri/i965/brw_nir.h
>> b/src/mesa/drivers/dri/i965/brw_nir.h
>> index 3131109..c76defd 100644
>> --- a/src/mesa/drivers/dri/i965/brw_nir.h
>> +++ b/src/mesa/drivers/dri/i965/brw_nir.h
>> @@ -77,7 +77,8 @@ void brw_nir_analyze_boolean_resolves(nir_shader *nir);
>> nir_shader *brw_create_nir(struct brw_context *brw,
>> const struct gl_shader_program *shader_prog,
>> const struct gl_program *prog,
>> - gl_shader_stage stage);
>> + gl_shader_stage stage,
>> + bool is_scalar);
>>
>> #ifdef __cplusplus
>> }
>> diff --git a/src/mesa/drivers/dri/i965/brw_program.c
>> b/src/mesa/drivers/dri/i965/brw_program.c
>> index 85e271d..b913f27 100644
>> --- a/src/mesa/drivers/dri/i965/brw_program.c
>> +++ b/src/mesa/drivers/dri/i965/brw_program.c
>> @@ -143,7 +143,8 @@ brwProgramStringNotify(struct gl_context *ctx,
>> brw_add_texrect_params(prog);
>>
>> if
>> (ctx->Const.ShaderCompilerOptions[MESA_SHADER_FRAGMENT].NirOptions) {
>> - prog->nir = brw_create_nir(brw, NULL, prog, MESA_SHADER_FRAGMENT);
>> + prog->nir = brw_create_nir(brw, NULL, prog, MESA_SHADER_FRAGMENT,
>> + true);
>
> I don't think this needs to be on its own line.
>
Ok, in general I have been strict with not going over 80 cols, but agree
it doesn't look good here.
>> }
>>
>> brw_fs_precompile(ctx, NULL, prog);
>> @@ -169,7 +170,8 @@ brwProgramStringNotify(struct gl_context *ctx,
>> brw_add_texrect_params(prog);
>>
>> if (ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].NirOptions) {
>> - prog->nir = brw_create_nir(brw, NULL, prog, MESA_SHADER_VERTEX);
>> + prog->nir = brw_create_nir(brw, NULL, prog, MESA_SHADER_VERTEX,
>> + false);
>
> Here too.
>
Ok.
>> }
>>
>> brw_vs_precompile(ctx, NULL, prog);
>> diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp
>> b/src/mesa/drivers/dri/i965/brw_shader.cpp
>> index cb04d8a..34b040d 100644
>> --- a/src/mesa/drivers/dri/i965/brw_shader.cpp
>> +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
>> @@ -397,8 +397,10 @@ brw_link_shader(struct gl_context *ctx, struct
>> gl_shader_program *shProg)
>>
>> brw_add_texrect_params(prog);
>>
>> - if (options->NirOptions)
>> - prog->nir = brw_create_nir(brw, shProg, prog, (gl_shader_stage)
>> stage);
>> + if (options->NirOptions) {
>> + prog->nir = brw_create_nir(brw, shProg, prog, (gl_shader_stage)
>> stage,
>> + is_scalar_shader_stage(brw, stage));
>> + }
>>
>> _mesa_reference_program(ctx, &prog, NULL);
>> }
>> diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp
>> b/src/mesa/drivers/dri/i965/brw_vec4.cpp
>> index ce04f1b..8f29e50 100644
>> --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
>> +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
>> @@ -1919,7 +1919,7 @@ brw_vs_emit(struct brw_context *brw,
>> */
>> assert(vp->Base.Id == 0 && prog == NULL);
>> vp->Base.nir =
>> - brw_create_nir(brw, NULL, &vp->Base, MESA_SHADER_VERTEX);
>> + brw_create_nir(brw, NULL, &vp->Base, MESA_SHADER_VERTEX, false);
>> }
>>
>> prog_data->base.dispatch_mode = DISPATCH_MODE_SIMD8;
>> --
>> 2.1.4
>>
>> _______________________________________________
>> 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
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
