fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 09:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: indentation fixes

Browse source 
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
This commit is contained in:
Jerome Glisse 2010-10-01 10:26:58 -04:00
parent 738aa29289
commit 29b491bd03
5 changed files with 54 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/r600/eg_asm.c
View file

@ -72,8 +72,8 @@ int eg_bc_cf_build(struct r600_bc *bc, struct r600_bc_cf *cf)
bc->bytecode[id++] = S_SQ_CF_WORD0_ADDR(cf->cf_addr >> 1); bc->bytecode[id++] = S_SQ_CF_WORD0_ADDR(cf->cf_addr >> 1);
bc->bytecode[id++] = S_SQ_CF_WORD1_CF_INST(cf->inst) | bc->bytecode[id++] = S_SQ_CF_WORD1_CF_INST(cf->inst) |
S_SQ_CF_WORD1_BARRIER(1) | S_SQ_CF_WORD1_BARRIER(1) |
S_SQ_CF_WORD1_COND(cf->cond) | S_SQ_CF_WORD1_COND(cf->cond) |
S_SQ_CF_WORD1_POP_COUNT(cf->pop_count); S_SQ_CF_WORD1_POP_COUNT(cf->pop_count);
break; break;
default: default:

90
src/gallium/drivers/r600/eg_state_inlines.h
View file

@ -494,9 +494,9 @@ static INLINE uint32_t r600_translate_vertex_data_type(enum pipe_format format)
switch (desc->channel[i].type) { switch (desc->channel[i].type) {
/* Half-floats, floats, doubles */ /* Half-floats, floats, doubles */
case UTIL_FORMAT_TYPE_FLOAT: case UTIL_FORMAT_TYPE_FLOAT:
switch (desc->channel[i].size) { switch (desc->channel[i].size) {
case 16: case 16:
switch (desc->nr_channels) { switch (desc->nr_channels) {
case 1: case 1:
result = V_030008_FMT_16_FLOAT; result = V_030008_FMT_16_FLOAT;
@ -512,7 +512,7 @@ static INLINE uint32_t r600_translate_vertex_data_type(enum pipe_format format)
break; break;
} }
break; break;
case 32: case 32:
switch (desc->nr_channels) { switch (desc->nr_channels) {
case 1: case 1:
result = V_030008_FMT_32_FLOAT; result = V_030008_FMT_32_FLOAT;
@ -528,16 +528,16 @@ static INLINE uint32_t r600_translate_vertex_data_type(enum pipe_format format)
break; break;
} }
break; break;
default: default:
goto out_unknown; goto out_unknown;
} }
break; break;
/* Unsigned ints */ /* Unsigned ints */
case UTIL_FORMAT_TYPE_UNSIGNED: case UTIL_FORMAT_TYPE_UNSIGNED:
/* Signed ints */ /* Signed ints */
case UTIL_FORMAT_TYPE_SIGNED: case UTIL_FORMAT_TYPE_SIGNED:
switch (desc->channel[i].size) { switch (desc->channel[i].size) {
case 8: case 8:
switch (desc->nr_channels) { switch (desc->nr_channels) {
case 1: case 1:
result = V_030008_FMT_8; result = V_030008_FMT_8;
@ -546,14 +546,14 @@ static INLINE uint32_t r600_translate_vertex_data_type(enum pipe_format format)
result = V_030008_FMT_8_8; result = V_030008_FMT_8_8;
break; break;
case 3: case 3:
// result = V_038008_FMT_8_8_8; /* fails piglit draw-vertices test */ // result = V_038008_FMT_8_8_8; /* fails piglit draw-vertices test */
// break; // break;
case 4: case 4:
result = V_030008_FMT_8_8_8_8; result = V_030008_FMT_8_8_8_8;
break; break;
} }
break; break;
case 16: case 16:
switch (desc->nr_channels) { switch (desc->nr_channels) {
case 1: case 1:
result = V_030008_FMT_16; result = V_030008_FMT_16;
@ -562,14 +562,14 @@ static INLINE uint32_t r600_translate_vertex_data_type(enum pipe_format format)
result = V_030008_FMT_16_16; result = V_030008_FMT_16_16;
break; break;
case 3: case 3:
// result = V_038008_FMT_16_16_16; /* fails piglit draw-vertices test */ // result = V_038008_FMT_16_16_16; /* fails piglit draw-vertices test */
// break; // break;
case 4: case 4:
result = V_030008_FMT_16_16_16_16; result = V_030008_FMT_16_16_16_16;
break; break;
} }
break; break;
case 32: case 32:
switch (desc->nr_channels) { switch (desc->nr_channels) {
case 1: case 1:
result = V_030008_FMT_32; result = V_030008_FMT_32;
@ -585,14 +585,14 @@ static INLINE uint32_t r600_translate_vertex_data_type(enum pipe_format format)
break; break;
} }
break; break;
default: default:
goto out_unknown; goto out_unknown;
} }
break; break;
default: default:
goto out_unknown; goto out_unknown;
} }
result = S_030008_DATA_FORMAT(result); result = S_030008_DATA_FORMAT(result);
if (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) { if (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) {
@ -611,36 +611,36 @@ out_unknown:
static INLINE uint32_t r600_translate_vertex_data_swizzle(enum pipe_format format) static INLINE uint32_t r600_translate_vertex_data_swizzle(enum pipe_format format)
{ {
const struct util_format_description *desc = util_format_description(format); const struct util_format_description *desc = util_format_description(format);
unsigned i; unsigned i;
uint32_t word3; uint32_t word3;
assert(format); assert(format);
if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) { if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) {
fprintf(stderr, "r600: Bad format %s in %s:%d\n", fprintf(stderr, "r600: Bad format %s in %s:%d\n",
util_format_short_name(format), __FUNCTION__, __LINE__); util_format_short_name(format), __FUNCTION__, __LINE__);
return 0; return 0;
} }
word3 = 0; word3 = 0;
for (i = 0; i < desc->nr_channels; i++) { for (i = 0; i < desc->nr_channels; i++) {
switch (i) { switch (i) {
case 0: case 0:
word3 |= S_03000C_DST_SEL_X(desc->swizzle[0]); word3 |= S_03000C_DST_SEL_X(desc->swizzle[0]);
break; break;
case 1: case 1:
word3 |= S_03000C_DST_SEL_Y(desc->swizzle[1]); word3 |= S_03000C_DST_SEL_Y(desc->swizzle[1]);
break; break;
case 2: case 2:
word3 |= S_03000C_DST_SEL_Z(desc->swizzle[2]); word3 |= S_03000C_DST_SEL_Z(desc->swizzle[2]);
break; break;
case 3: case 3:
word3 |= S_03000C_DST_SEL_W(desc->swizzle[3]); word3 |= S_03000C_DST_SEL_W(desc->swizzle[3]);
break; break;
} }
} }
return word3; return word3;
} }
#endif #endif

2
src/gallium/drivers/r600/r600_asm.h
View file

@ -58,7 +58,7 @@ struct r600_bc_alu {
unsigned bank_swizzle; unsigned bank_swizzle;
unsigned bank_swizzle_force; unsigned bank_swizzle_force;
u32 value[4]; u32 value[4];
int hw_gpr[NUM_OF_CYCLES][NUM_OF_COMPONENTS]; int hw_gpr[NUM_OF_CYCLES][NUM_OF_COMPONENTS];
}; };
struct r600_bc_tex { struct r600_bc_tex {

12
src/gallium/drivers/r600/r600_buffer.c
View file

@ -43,23 +43,23 @@ u32 r600_domain_from_usage(unsigned usage)
u32 domain = RADEON_GEM_DOMAIN_GTT; u32 domain = RADEON_GEM_DOMAIN_GTT;
if (usage & PIPE_BIND_RENDER_TARGET) { if (usage & PIPE_BIND_RENDER_TARGET) {
domain |= RADEON_GEM_DOMAIN_VRAM; domain |= RADEON_GEM_DOMAIN_VRAM;
} }
if (usage & PIPE_BIND_DEPTH_STENCIL) { if (usage & PIPE_BIND_DEPTH_STENCIL) {
domain |= RADEON_GEM_DOMAIN_VRAM; domain |= RADEON_GEM_DOMAIN_VRAM;
} }
if (usage & PIPE_BIND_SAMPLER_VIEW) { if (usage & PIPE_BIND_SAMPLER_VIEW) {
domain |= RADEON_GEM_DOMAIN_VRAM; domain |= RADEON_GEM_DOMAIN_VRAM;
} }
/* also need BIND_BLIT_SOURCE/DESTINATION ? */ /* also need BIND_BLIT_SOURCE/DESTINATION ? */
if (usage & PIPE_BIND_VERTEX_BUFFER) { if (usage & PIPE_BIND_VERTEX_BUFFER) {
domain |= RADEON_GEM_DOMAIN_GTT; domain |= RADEON_GEM_DOMAIN_GTT;
} }
if (usage & PIPE_BIND_INDEX_BUFFER) { if (usage & PIPE_BIND_INDEX_BUFFER) {
domain |= RADEON_GEM_DOMAIN_GTT; domain |= RADEON_GEM_DOMAIN_GTT;
} }
if (usage & PIPE_BIND_CONSTANT_BUFFER) { if (usage & PIPE_BIND_CONSTANT_BUFFER) {
domain |= RADEON_GEM_DOMAIN_VRAM; domain |= RADEON_GEM_DOMAIN_VRAM;
} }
return domain; return domain;

1
src/gallium/drivers/r600/r600_resource.c
View file

@ -63,4 +63,3 @@ void r600_init_context_resource_functions(struct r600_pipe_context *r600)
r600->context.transfer_inline_write = u_transfer_inline_write_vtbl; r600->context.transfer_inline_write = u_transfer_inline_write_vtbl;
r600->context.is_resource_referenced = u_is_resource_referenced_vtbl; r600->context.is_resource_referenced = u_is_resource_referenced_vtbl;
} }