r600g: Unify comment style somewhat.

Signed-off-by: Henri Verbeet <hverbeet@gmail.com>

diff --git a/src/gallium/drivers/r600/eg_state_inlines.h b/src/gallium/drivers/r600/eg_state_inlines.h
index 1b4f75947b355be9afa118ef35646598e7074312..586b7cf2d11d6345ca111e04aeb4c0730b358cdb 100644 (file)
--- a/src/gallium/drivers/r600/eg_state_inlines.h
+++ b/src/gallium/drivers/r600/eg_state_inlines.h
@@ -348,7 +348,7 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
 
        case PIPE_FORMAT_A8B8G8R8_UNORM:
        case PIPE_FORMAT_X8B8G8R8_UNORM:
-               //        case PIPE_FORMAT_R8SG8SB8UX8U_NORM:
+       /* case PIPE_FORMAT_R8SG8SB8UX8U_NORM: */
                return V_028C70_SWAP_STD_REV;
 
        case PIPE_FORMAT_Z24X8_UNORM:
@@ -501,7 +501,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_UYVY:
        case PIPE_FORMAT_YUYV:
        default:
-               //R600_ERR("unsupported color format %d\n", format);
+               /* R600_ERR("unsupported color format %d\n", format); */
                return ~0; /* Unsupported. */
        }
 }

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 9813e01c966ba658ffbd36e8038d627e1c108176..89a8d942a549307cfa5d944331086938e7e17d5b 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -1232,9 +1232,11 @@ void evergreen_init_config(struct r600_pipe_context *rctx)
        r600_pipe_state_add_reg(rstate, R_009100_SPI_CONFIG_CNTL, 0x0, 0xFFFFFFFF, NULL);
        r600_pipe_state_add_reg(rstate, R_00913C_SPI_CONFIG_CNTL_1, S_00913C_VTX_DONE_DELAY(4), 0xFFFFFFFF, NULL);
 
-//     r600_pipe_state_add_reg(rstate, R_028350_SX_MISC, 0x0, 0xFFFFFFFF, NULL);
+#if 0
+       r600_pipe_state_add_reg(rstate, R_028350_SX_MISC, 0x0, 0xFFFFFFFF, NULL);
 
-//     r600_pipe_state_add_reg(rstate, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x0, 0xFFFFFFFF, NULL);
+       r600_pipe_state_add_reg(rstate, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x0, 0xFFFFFFFF, NULL);
+#endif
        r600_pipe_state_add_reg(rstate, R_028A48_PA_SC_MODE_CNTL_0, 0x0, 0xFFFFFFFF, NULL);
        r600_pipe_state_add_reg(rstate, R_028A4C_PA_SC_MODE_CNTL_1, 0x0, 0xFFFFFFFF, NULL);
 

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index f037423f4bb5318b4b85cbd47fd25113296d7569..033e84665f58427a7b88af808494ef205dec6449 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -525,19 +525,19 @@ static int assign_alu_units(struct r600_bc *bc, struct r600_bc_alu *alu_first,
                else if (is_alu_vec_unit_inst(bc, alu))
                        trans = 0;
                else if (assignment[chan])
-                       trans = 1; // assume ALU_INST_PREFER_VECTOR
+                       trans = 1; /* Assume ALU_INST_PREFER_VECTOR. */
                else
                        trans = 0;
 
                if (trans) {
                        if (assignment[4]) {
-                               assert(0); //ALU.Trans has already been allocated
+                               assert(0); /* ALU.Trans has already been allocated. */
                                return -1;
                        }
                        assignment[4] = alu;
                } else {
                        if (assignment[chan]) {
-                               assert(0); //ALU.chan has already been allocated
+                               assert(0); /* ALU.chan has already been allocated. */
                                return -1;
                        }
                        assignment[chan] = alu;
@@ -589,7 +589,7 @@ static int reserve_gpr(struct alu_bank_swizzle *bs, unsigned sel, unsigned chan,
        if (bs->hw_gpr[cycle][chan] == -1)
                bs->hw_gpr[cycle][chan] = sel;
        else if (bs->hw_gpr[cycle][chan] != (int)sel) {
-               // Another scalar operation has already used GPR read port for channel
+               /* Another scalar operation has already used the GPR read port for the channel. */
                return -1;
        }
        return 0;
@@ -609,9 +609,9 @@ static int reserve_cfile(struct r600_bc *bc, struct alu_bank_swizzle *bs, unsign
                        return 0;
                } else if (bs->hw_cfile_addr[res] == sel &&
                        bs->hw_cfile_elem[res] == chan)
-                       return 0; // Read for this scalar element already reserved, nothing to do here.
+                       return 0; /* Read for this scalar element already reserved, nothing to do here. */
        }
-       // All cfile read ports are used, cannot reference vector element
+       /* All cfile read ports are used, cannot reference vector element. */
        return -1;
 }
 
@@ -626,8 +626,8 @@ static int is_gpr(unsigned sel)
 static int is_cfile(unsigned sel)
 {
        return (sel > 255 && sel < 512) ||
-               (sel > 511 && sel < 4607) || // Kcache before translate
-               (sel > 127 && sel < 192); // Kcache after translate
+               (sel > 511 && sel < 4607) || /* Kcache before translation. */
+               (sel > 127 && sel < 192); /* Kcache after translation. */
 }
 
 static int is_const(int sel)
@@ -649,8 +649,8 @@ static int check_vector(struct r600_bc *bc, struct r600_bc_alu *alu,
                if (is_gpr(sel)) {
                        cycle = cycle_for_bank_swizzle_vec[bank_swizzle][src];
                        if (src == 1 && sel == alu->src[0].sel && elem == alu->src[0].chan)
-                               // Nothing to do; special-case optimization,
-                               // second source uses first source’s reservation
+                               /* Nothing to do; special-case optimization,
+                                * second source uses first source’s reservation. */
                                continue;
                        else {
                                r = reserve_gpr(bs, sel, elem, cycle);
@@ -662,7 +662,7 @@ static int check_vector(struct r600_bc *bc, struct r600_bc_alu *alu,
                        if (r)
                                return r;
                }
-               // No restrictions on PV, PS, literal or special constants
+               /* No restrictions on PV, PS, literal or special constants. */
        }
        return 0;
 }
@@ -676,10 +676,10 @@ static int check_scalar(struct r600_bc *bc, struct r600_bc_alu *alu,
        for (const_count = 0, src = 0; src < num_src; ++src) {
                sel = alu->src[src].sel;
                elem = alu->src[src].chan;
-               if (is_const(sel)) { // Any constant, including literal and inline constants
+               if (is_const(sel)) { /* Any constant, including literal and inline constants. */
                        if (const_count >= 2)
-                               // More than two references to a constant in
-                               // transcendental operation.
+                               /* More than two references to a constant in
+                                * transcendental operation. */
                                return -1;
                        else
                                const_count++;
@@ -696,14 +696,14 @@ static int check_scalar(struct r600_bc *bc, struct r600_bc_alu *alu,
                if (is_gpr(sel)) {
                        cycle = cycle_for_bank_swizzle_scl[bank_swizzle][src];
                        if (cycle < const_count)
-                               // Cycle for GPR load conflicts with
-                               // constant load in transcendental operation.
+                               /* Cycle for GPR load conflicts with
+                                * constant load in transcendental operation. */
                                return -1;
                        r = reserve_gpr(bs, sel, elem, cycle);
                        if (r)
                                return r;
                }
-               // PV PS restrictions
+               /* PV PS restrictions */
                if (const_count && (sel == 254 || sel == 255)) {
                        cycle = cycle_for_bank_swizzle_scl[bank_swizzle][src];
                        if (cycle < const_count)
@@ -731,8 +731,8 @@ static int check_and_set_bank_swizzle(struct r600_bc *bc,
        if (forced)
                return 0;
 
-       // just check every possible combination of bank swizzle
-       // not very efficent, but works on the first try in most of the cases
+       /* Just check every possible combination of bank swizzle.
+        * Not very efficent, but works on the first try in most of the cases. */
        for (i = 0; i < 4; i++)
                bank_swizzle[i] = SQ_ALU_VEC_012;
        bank_swizzle[4] = SQ_ALU_SCL_210;
@@ -773,7 +773,7 @@ static int check_and_set_bank_swizzle(struct r600_bc *bc,
                }
        }
 
-       // couldn't find a working swizzle
+       /* Couldn't find a working swizzle. */
        return -1;
 }
 
@@ -843,17 +843,17 @@ void r600_bc_special_constants(u32 value, unsigned *sel, unsigned *neg)
        case -1:
                *sel = V_SQ_ALU_SRC_M_1_INT;
                break;
-       case 0x3F800000: // 1.0f
+       case 0x3F800000: /* 1.0f */
                *sel = V_SQ_ALU_SRC_1;
                break;
-       case 0x3F000000: // 0.5f
+       case 0x3F000000: /* 0.5f */
                *sel = V_SQ_ALU_SRC_0_5;
                break;
-       case 0xBF800000: // -1.0f
+       case 0xBF800000: /* -1.0f */
                *sel = V_SQ_ALU_SRC_1;
                *neg ^= 1;
                break;
-       case 0xBF000000: // -0.5f
+       case 0xBF000000: /* -0.5f */
                *sel = V_SQ_ALU_SRC_0_5;
                *neg ^= 1;
                break;
@@ -946,13 +946,13 @@ static int merge_inst_groups(struct r600_bc *bc, struct r600_bc_alu *slots[5],
                if (slots[i] && r600_bc_alu_nliterals(bc, slots[i], literal, &nliteral))
                        return 0;
 
-               // let's check used slots
+               /* Let's check used slots. */
                if (prev[i] && !slots[i]) {
                        result[i] = prev[i];
                        continue;
                } else if (prev[i] && slots[i]) {
                        if (result[4] == NULL && prev[4] == NULL && slots[4] == NULL) {
-                               // trans unit is still free try to use it
+                               /* Trans unit is still free try to use it. */
                                if (is_alu_any_unit_inst(bc, slots[i])) {
                                        result[i] = prev[i];
                                        result[4] = slots[i];
@@ -971,14 +971,14 @@ static int merge_inst_groups(struct r600_bc *bc, struct r600_bc_alu *slots[5],
                alu = slots[i];
                num_once_inst += is_alu_once_inst(bc, alu);
 
-               // let's check dst gpr
+               /* Let's check dst gpr. */
                if (alu->dst.rel) {
                        if (have_mova)
                                return 0;
                        have_rel = 1;
                }
 
-               // let's check source gprs
+               /* Let's check source gprs */
                num_src = r600_bc_get_num_operands(bc, alu);
                for (src = 0; src < num_src; ++src) {
                        if (alu->src[src].rel) {
@@ -987,7 +987,7 @@ static int merge_inst_groups(struct r600_bc *bc, struct r600_bc_alu *slots[5],
                                have_rel = 1;
                        }
 
-                       // constants doesn't matter
+                       /* Constants don't matter. */
                        if (!is_gpr(alu->src[src].sel))
                                continue;
 
@@ -995,7 +995,7 @@ static int merge_inst_groups(struct r600_bc *bc, struct r600_bc_alu *slots[5],
                                if (!prev[j] || !prev[j]->dst.write)
                                        continue;
 
-                               // if it's relative then we can't determin which gpr is really used
+                               /* If it's relative then we can't determin which gpr is really used. */
                                if (prev[j]->dst.chan == alu->src[src].chan &&
                                        (prev[j]->dst.sel == alu->src[src].sel ||
                                        prev[j]->dst.rel || alu->src[src].rel))
@@ -1935,7 +1935,7 @@ void r600_bc_dump(struct r600_bc *bc)
                        fprintf(stderr, "%04d %08X   ", id, bc->bytecode[id]);
                        fprintf(stderr, "ENDIAN:%d ", vtx->endian);
                        fprintf(stderr, "OFFSET:%d\n", vtx->offset);
-                       //TODO
+                       /* TODO */
                        id++;
                        fprintf(stderr, "%04d %08X   \n", id, bc->bytecode[id]);
                        id++;
@@ -2091,11 +2091,11 @@ int r600_vertex_elements_build_fetch_shader(struct r600_pipe_context *rctx, stru
        u32 *bytecode;
        int i, r;
 
-       /* vertex elements offset need special handling, if offset is bigger
-       + * than what we can put in fetch instruction then we need to alterate
-        * the vertex resource offset. In such case in order to simplify code
-        * we will bound one resource per elements. It's a worst case scenario.
-        */
+       /* Vertex element offsets need special handling. If the offset is
+        * bigger than what we can put in the fetch instruction we need to
+        * alter the vertex resource offset. In order to simplify code we
+        * will bind one resource per element in such cases. It's a worst
+        * case scenario. */
        for (i = 0; i < ve->count; i++) {
                ve->vbuffer_offset[i] = C_SQ_VTX_WORD2_OFFSET & elements[i].src_offset;
                if (ve->vbuffer_offset[i]) {

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 4bc56448bce3525295dab713c4e5ceeb1de7d515..e28d834dfeea72cd61b849140f634c190ae340ed 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -487,9 +487,10 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
                else
                        return 16;
        case PIPE_SHADER_CAP_MAX_TEMPS:
-               return 256; //max native temporaries
+               return 256; /* Max native temporaries. */
        case PIPE_SHADER_CAP_MAX_ADDRS:
-               return 1; //max native address registers/* FIXME Isn't this equal to TEMPS? */
+               /* FIXME Isn't this equal to TEMPS? */
+               return 1; /* Max native address registers */
        case PIPE_SHADER_CAP_MAX_CONSTS:
                return R600_MAX_CONST_BUFFER_SIZE;
        case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 96ac59b2e93f4016b613d4aaf210636fd51ddbf6..0f4c0134dce4bf141fe599908e7452669d3220dc 100644 (file)
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1993,9 +1993,11 @@ static int tgsi_exp(struct r600_shader_ctx *ctx)
                r600_bc_src(&alu.src[0], &ctx->src[0], 0);
 
                alu.dst.sel = ctx->temp_reg;
-//             r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
-//             if (r)
-//                     return r;
+#if 0
+               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               if (r)
+                       return r;
+#endif
                alu.dst.write = 1;
                alu.dst.chan = 1;
 

diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h
index 45fb0ce5e82bc633e8021bcb306c7ccb9d2191f0..09d07f784076328d03c5b1c64ef0464fce14aa7d 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_inlines.h
+++ b/src/gallium/drivers/r600/r600_state_inlines.h
@@ -342,7 +342,7 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
 
        case PIPE_FORMAT_A8B8G8R8_UNORM:
        case PIPE_FORMAT_X8B8G8R8_UNORM:
-               //        case PIPE_FORMAT_R8SG8SB8UX8U_NORM:
+       /* case PIPE_FORMAT_R8SG8SB8UX8U_NORM: */
                return V_0280A0_SWAP_STD_REV;
 
        case PIPE_FORMAT_Z24X8_UNORM:
@@ -496,7 +496,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_UYVY:
        case PIPE_FORMAT_YUYV:
        default:
-               //R600_ERR("unsupported color format %d %s\n", format, util_format_name(format));
+               /* R600_ERR("unsupported color format %d %s\n", format, util_format_name(format)); */
                return ~0; /* Unsupported. */
        }
 }

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 90f34f7afb1ae392355833057a6cd757b60f11f3..eb696b73ee8a8d02a7dbb59f3415d592ccbce172 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -1083,6 +1083,6 @@ out_word4:
                *yuv_format_p = yuv_format;
        return result;
 out_unknown:
-//     R600_ERR("Unable to handle texformat %d %s\n", format, util_format_name(format));
+       /* R600_ERR("Unable to handle texformat %d %s\n", format, util_format_name(format)); */
        return ~0;
 }