[Mesa-dev] [PATCH 2/2] r600g: disable I2F conversion for InstanceID if integers are supported

[Vadim Girlin]

On Fri, 2012-04-20 at 17:40 +0100, Dave Airlie wrote: 
> > Signed-off-by: Vadim Girlin <vadimgirlin at gmail.com>
> 
> Hi Vadim, did you want this committed?

Yes, I almost forgot about these patches. AFAICS they are already in
master, thanks!

Vadim

> 
> Dave.
> 
> > ---
> >  src/gallium/drivers/r600/r600_shader.c |   27 ++++++++++++++++-----------
> >  1 files changed, 16 insertions(+), 11 deletions(-)
> >
> > diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
> > index 1adf344..bfae51c 100644
> > --- a/src/gallium/drivers/r600/r600_shader.c
> > +++ b/src/gallium/drivers/r600/r600_shader.c
> > @@ -194,6 +194,7 @@ struct r600_shader_ctx {
> >        boolean                 clip_vertex_write;
> >        unsigned                cv_output;
> >        int                                     fragcoord_input;
> > +       int                                     native_integers;
> >  };
> >
> >  struct r600_shader_tgsi_instruction {
> > @@ -500,20 +501,22 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
> >
> >        case TGSI_FILE_SYSTEM_VALUE:
> >                if (d->Semantic.Name == TGSI_SEMANTIC_INSTANCEID) {
> > -                       struct r600_bytecode_alu alu;
> > -                       memset(&alu, 0, sizeof(struct r600_bytecode_alu));
> > +                       if (!ctx->native_integers) {
> > +                               struct r600_bytecode_alu alu;
> > +                               memset(&alu, 0, sizeof(struct r600_bytecode_alu));
> >
> > -                       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_INT_TO_FLT);
> > -                       alu.src[0].sel = 0;
> > -                       alu.src[0].chan = 3;
> > +                               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_INT_TO_FLT);
> > +                               alu.src[0].sel = 0;
> > +                               alu.src[0].chan = 3;
> >
> > -                       alu.dst.sel = 0;
> > -                       alu.dst.chan = 3;
> > -                       alu.dst.write = 1;
> > -                       alu.last = 1;
> > +                               alu.dst.sel = 0;
> > +                               alu.dst.chan = 3;
> > +                               alu.dst.write = 1;
> > +                               alu.last = 1;
> >
> > -                       if ((r = r600_bytecode_add_alu(ctx->bc, &alu)))
> > -                               return r;
> > +                               if ((r = r600_bytecode_add_alu(ctx->bc, &alu)))
> > +                                       return r;
> > +                       }
> >                        break;
> >                } else if (d->Semantic.Name == TGSI_SEMANTIC_VERTEXID)
> >                        break;
> > @@ -818,6 +821,8 @@ static int r600_shader_from_tgsi(struct r600_context * rctx, struct r600_pipe_sh
> >
> >        ctx.bc = &shader->bc;
> >        ctx.shader = shader;
> > +       ctx.native_integers = (rctx->screen->glsl_feature_level >= 130);
> > +
> >        r600_bytecode_init(ctx.bc, rctx->chip_class, rctx->family);
> >        ctx.tokens = tokens;
> >        tgsi_scan_shader(tokens, &ctx.info);
> > --
> > 1.7.7.6
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev