vc4: Add support for 16-bit signed/unsigned norm/scaled vertex attrs.

[mesa.git] / src / gallium / drivers / r600 / r600_isa.c

diff --git a/src/gallium/drivers/r600/r600_isa.c b/src/gallium/drivers/r600/r600_isa.c
index 4c6ccacdd07c183e23272441f502c46379ad0e6f..4ea71035c7939435113aa1dd6f1dc5b7ee861af9 100644 (file)
--- a/src/gallium/drivers/r600/r600_isa.c
+++ b/src/gallium/drivers/r600/r600_isa.c
@@ -30,8 +30,8 @@
 int r600_isa_init(struct r600_context *ctx, struct r600_isa *isa) {
        unsigned i;
 
-       assert(ctx->chip_class >= R600 && ctx->chip_class <= CAYMAN);
-       isa->hw_class = ctx->chip_class - R600;
+       assert(ctx->b.chip_class >= R600 && ctx->b.chip_class <= CAYMAN);
+       isa->hw_class = ctx->b.chip_class - R600;
 
        /* reverse lookup maps are required for bytecode parsing */
 
@@ -89,14 +89,10 @@ int r600_isa_destroy(struct r600_isa *isa) {
        if (!isa)
                return 0;
 
-       if (isa->alu_op2_map)
-               free(isa->alu_op2_map);
-       if (isa->alu_op3_map)
-               free(isa->alu_op3_map);
-       if (isa->fetch_map)
-               free(isa->fetch_map);
-       if (isa->cf_map)
-               free(isa->cf_map);
+       free(isa->alu_op2_map);
+       free(isa->alu_op3_map);
+       free(isa->fetch_map);
+       free(isa->cf_map);
 
        free(isa);
        return 0;