gallium/ureg: Set the next shader stage from the shader info.

[mesa.git] / src / gallium / auxiliary / tgsi / tgsi_sanity.c

diff --git a/src/gallium/auxiliary/tgsi/tgsi_sanity.c b/src/gallium/auxiliary/tgsi/tgsi_sanity.c
index d14372feb30dc81998808f317394f432140dc4eb..35f00730380412c3939ce1eb9ec4b4556a02aa89 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_sanity.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_sanity.c
@@ -47,9 +47,9 @@ typedef struct {
 struct sanity_check_ctx
 {
    struct tgsi_iterate_context iter;
-   struct cso_hash *regs_decl;
-   struct cso_hash *regs_used;
-   struct cso_hash *regs_ind_used;
+   struct cso_hash regs_decl;
+   struct cso_hash regs_used;
+   struct cso_hash regs_ind_used;
 
    uint num_imms;
    uint num_instructions;
@@ -203,7 +203,7 @@ is_register_declared(
    const scan_register *reg)
 {
    void *data = cso_hash_find_data_from_template(
-      ctx->regs_decl, scan_register_key(reg),
+      &ctx->regs_decl, scan_register_key(reg),
       (void*)reg, sizeof(scan_register));
    return  data ? TRUE : FALSE;
 }
@@ -214,7 +214,7 @@ is_any_register_declared(
    uint file )
 {
    struct cso_hash_iter iter =
-      cso_hash_first_node(ctx->regs_decl);
+      cso_hash_first_node(&ctx->regs_decl);
 
    while (!cso_hash_iter_is_null(iter)) {
       scan_register *reg = (scan_register *)cso_hash_iter_data(iter);
@@ -232,7 +232,7 @@ is_register_used(
    scan_register *reg)
 {
    void *data = cso_hash_find_data_from_template(
-      ctx->regs_used, scan_register_key(reg),
+      &ctx->regs_used, scan_register_key(reg),
       reg, sizeof(scan_register));
    return  data ? TRUE : FALSE;
 }
@@ -243,7 +243,7 @@ is_ind_register_used(
    struct sanity_check_ctx *ctx,
    scan_register *reg)
 {
-   return cso_hash_contains(ctx->regs_ind_used, reg->file);
+   return cso_hash_contains(&ctx->regs_ind_used, reg->file);
 }
 
 static const char *file_names[TGSI_FILE_COUNT] =
@@ -256,7 +256,6 @@ static const char *file_names[TGSI_FILE_COUNT] =
    "SAMP",
    "ADDR",
    "IMM",
-   "PRED",
    "SV",
    "RES"
 };
@@ -281,7 +280,7 @@ check_register_usage(
       if (!is_any_register_declared( ctx, reg->file ))
          report_error( ctx, "%s: Undeclared %s register", file_names[reg->file], name );
       if (!is_ind_register_used(ctx, reg))
-         cso_hash_insert(ctx->regs_ind_used, reg->file, reg);
+         cso_hash_insert(&ctx->regs_ind_used, reg->file, reg);
       else
          FREE(reg);
    }
@@ -297,7 +296,7 @@ check_register_usage(
          }
       }
       if (!is_register_used( ctx, reg ))
-         cso_hash_insert(ctx->regs_used, scan_register_key(reg), reg);
+         cso_hash_insert(&ctx->regs_used, scan_register_key(reg), reg);
       else
          FREE(reg);
    }
@@ -314,23 +313,25 @@ iter_instruction(
    uint i;
 
    if (inst->Instruction.Opcode == TGSI_OPCODE_END) {
-      if (ctx->index_of_END != ~0) {
+      if (ctx->index_of_END != ~0u) {
          report_error( ctx, "Too many END instructions" );
       }
       ctx->index_of_END = ctx->num_instructions;
    }
 
    info = tgsi_get_opcode_info( inst->Instruction.Opcode );
-   if (info == NULL) {
+   if (!info) {
       report_error( ctx, "(%u): Invalid instruction opcode", inst->Instruction.Opcode );
       return TRUE;
    }
 
    if (info->num_dst != inst->Instruction.NumDstRegs) {
-      report_error( ctx, "%s: Invalid number of destination operands, should be %u", info->mnemonic, info->num_dst );
+      report_error( ctx, "%s: Invalid number of destination operands, should be %u",
+                    tgsi_get_opcode_name(inst->Instruction.Opcode), info->num_dst );
    }
    if (info->num_src != inst->Instruction.NumSrcRegs) {
-      report_error( ctx, "%s: Invalid number of source operands, should be %u", info->mnemonic, info->num_src );
+      report_error( ctx, "%s: Invalid number of source operands, should be %u",
+                    tgsi_get_opcode_name(inst->Instruction.Opcode), info->num_src );
    }
 
    /* Check destination and source registers' validity.
@@ -380,7 +381,7 @@ check_and_declare(struct sanity_check_ctx *ctx,
    if (is_register_declared( ctx, reg))
       report_error( ctx, "%s[%u]: The same register declared more than once",
                     file_names[reg->file], reg->indices[0] );
-   cso_hash_insert(ctx->regs_decl,
+   cso_hash_insert(&ctx->regs_decl,
                    scan_register_key(reg),
                    reg);
 }
@@ -414,9 +415,9 @@ iter_declaration(
          decl->Semantic.Name == TGSI_SEMANTIC_TESSOUTER ||
          decl->Semantic.Name == TGSI_SEMANTIC_TESSINNER;
       if (file == TGSI_FILE_INPUT && !patch && (
-                processor == TGSI_PROCESSOR_GEOMETRY ||
-                processor == TGSI_PROCESSOR_TESS_CTRL ||
-                processor == TGSI_PROCESSOR_TESS_EVAL)) {
+                processor == PIPE_SHADER_GEOMETRY ||
+                processor == PIPE_SHADER_TESS_CTRL ||
+                processor == PIPE_SHADER_TESS_EVAL)) {
          uint vert;
          for (vert = 0; vert < ctx->implied_array_size; ++vert) {
             scan_register *reg = MALLOC(sizeof(scan_register));
@@ -424,7 +425,7 @@ iter_declaration(
             check_and_declare(ctx, reg);
          }
       } else if (file == TGSI_FILE_OUTPUT && !patch &&
-                 processor == TGSI_PROCESSOR_TESS_CTRL) {
+                 processor == PIPE_SHADER_TESS_CTRL) {
          uint vert;
          for (vert = 0; vert < ctx->implied_out_array_size; ++vert) {
             scan_register *reg = MALLOC(sizeof(scan_register));
@@ -462,7 +463,7 @@ iter_immediate(
     */
    reg = MALLOC(sizeof(scan_register));
    fill_scan_register1d(reg, TGSI_FILE_IMMEDIATE, ctx->num_imms);
-   cso_hash_insert(ctx->regs_decl, scan_register_key(reg), reg);
+   cso_hash_insert(&ctx->regs_decl, scan_register_key(reg), reg);
    ctx->num_imms++;
 
    /* Check data type validity.
@@ -485,11 +486,11 @@ iter_property(
 {
    struct sanity_check_ctx *ctx = (struct sanity_check_ctx *) iter;
 
-   if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY &&
+   if (iter->processor.Processor == PIPE_SHADER_GEOMETRY &&
        prop->Property.PropertyName == TGSI_PROPERTY_GS_INPUT_PRIM) {
       ctx->implied_array_size = u_vertices_per_prim(prop->u[0].Data);
    }
-   if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL &&
+   if (iter->processor.Processor == PIPE_SHADER_TESS_CTRL &&
        prop->Property.PropertyName == TGSI_PROPERTY_TCS_VERTICES_OUT)
       ctx->implied_out_array_size = prop->u[0].Data;
    return TRUE;
@@ -499,8 +500,8 @@ static boolean
 prolog(struct tgsi_iterate_context *iter)
 {
    struct sanity_check_ctx *ctx = (struct sanity_check_ctx *) iter;
-   if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
-       iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL)
+   if (iter->processor.Processor == PIPE_SHADER_TESS_CTRL ||
+       iter->processor.Processor == PIPE_SHADER_TESS_EVAL)
       ctx->implied_array_size = 32;
    return TRUE;
 }
@@ -513,7 +514,7 @@ epilog(
 
    /* There must be an END instruction somewhere.
     */
-   if (ctx->index_of_END == ~0) {
+   if (ctx->index_of_END == ~0u) {
       report_error( ctx, "Missing END instruction" );
    }
 
@@ -521,7 +522,7 @@ epilog(
     */
    {
       struct cso_hash_iter iter =
-         cso_hash_first_node(ctx->regs_decl);
+         cso_hash_first_node(&ctx->regs_decl);
 
       while (!cso_hash_iter_is_null(iter)) {
          scan_register *reg = (scan_register *)cso_hash_iter_data(iter);
@@ -551,7 +552,7 @@ regs_hash_destroy(struct cso_hash *hash)
       assert(reg->file < TGSI_FILE_COUNT);
       FREE(reg);
    }
-   cso_hash_delete(hash);
+   cso_hash_deinit(hash);
 }
 
 boolean
@@ -559,6 +560,7 @@ tgsi_sanity_check(
    const struct tgsi_token *tokens )
 {
    struct sanity_check_ctx ctx;
+   boolean retval;
 
    ctx.iter.prolog = prolog;
    ctx.iter.iterate_instruction = iter_instruction;
@@ -567,9 +569,9 @@ tgsi_sanity_check(
    ctx.iter.iterate_property = iter_property;
    ctx.iter.epilog = epilog;
 
-   ctx.regs_decl = cso_hash_create();
-   ctx.regs_used = cso_hash_create();
-   ctx.regs_ind_used = cso_hash_create();
+   cso_hash_init(&ctx.regs_decl);
+   cso_hash_init(&ctx.regs_used);
+   cso_hash_init(&ctx.regs_ind_used);
 
    ctx.num_imms = 0;
    ctx.num_instructions = 0;
@@ -580,11 +582,12 @@ tgsi_sanity_check(
    ctx.implied_array_size = 0;
    ctx.print = debug_get_option_print_sanity();
 
-   if (!tgsi_iterate_shader( tokens, &ctx.iter ))
+   retval = tgsi_iterate_shader( tokens, &ctx.iter );
+   regs_hash_destroy(&ctx.regs_decl);
+   regs_hash_destroy(&ctx.regs_used);
+   regs_hash_destroy(&ctx.regs_ind_used);
+   if (retval == FALSE)
       return FALSE;
 
-   regs_hash_destroy(ctx.regs_decl);
-   regs_hash_destroy(ctx.regs_used);
-   regs_hash_destroy(ctx.regs_ind_used);
    return ctx.errors == 0;
 }