diff options
author | Jerome Glisse <jglisse@redhat.com> | 2010-02-22 22:11:00 +0100 |
---|---|---|
committer | Jerome Glisse <jglisse@redhat.com> | 2010-02-22 22:11:00 +0100 |
commit | 826d3cc24faf5d01e2009b7e21c57f6b52adb7b6 (patch) | |
tree | 5129dfa5a488a40cbe100e4e098008cc757dcd7c | |
parent | f11d282caab9e2a06a9ee9ef00d67be364e44fa4 (diff) |
rename db_cntl to depth to match gallium
-rw-r--r-- | r600_atom.c | 36 | ||||
-rw-r--r-- | r600_batch.c | 10 | ||||
-rw-r--r-- | r600_winsys.h | 8 | ||||
-rw-r--r-- | test.c | 30 |
4 files changed, 42 insertions, 42 deletions
diff --git a/r600_atom.c b/r600_atom.c index 8100a44..3fe5263 100644 --- a/r600_atom.c +++ b/r600_atom.c @@ -404,50 +404,50 @@ int r600_constants_create(struct r600_winsys *rdev, struct r600_atom *atom, void /* - * r600_db_cntl + * r600_depth */ -int r600_db_cntl_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data) +int r600_depth_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data) { - struct drm_r600_db_cntl *db_cntl; + struct drm_r600_depth *depth; int r; - db_cntl = malloc(sizeof(struct drm_r600_db_cntl)); - if (db_cntl == NULL) + depth = malloc(sizeof(struct drm_r600_depth)); + if (depth == NULL) return -ENOMEM; - memcpy(db_cntl, data, sizeof(struct drm_r600_db_cntl)); - atom->state = db_cntl; + memcpy(depth, data, sizeof(struct drm_r600_depth)); + atom->state = depth; /* DB_STENCIL_CLEAR */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2); atom->pkts[atom->npkts++] = 0x0000000A; - atom->pkts[atom->npkts++] = db_cntl->db_stencil_clear; - atom->pkts[atom->npkts++] = db_cntl->db_depth_clear; + atom->pkts[atom->npkts++] = depth->db_stencil_clear; + atom->pkts[atom->npkts++] = depth->db_depth_clear; /* DB_STENCILREFMASK */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2); atom->pkts[atom->npkts++] = 0x0000010C; - atom->pkts[atom->npkts++] = db_cntl->db_stencilrefmask; - atom->pkts[atom->npkts++] = db_cntl->db_stencilrefmask_bf; + atom->pkts[atom->npkts++] = depth->db_stencilrefmask; + atom->pkts[atom->npkts++] = depth->db_stencilrefmask_bf; /* DB_DEPTH_CONTROL */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1); atom->pkts[atom->npkts++] = 0x00000200; - atom->pkts[atom->npkts++] = db_cntl->db_depth_control; + atom->pkts[atom->npkts++] = depth->db_depth_control; /* DB_SHADER_CONTROL */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1); atom->pkts[atom->npkts++] = 0x00000203; - atom->pkts[atom->npkts++] = db_cntl->db_shader_control; + atom->pkts[atom->npkts++] = depth->db_shader_control; /* DB_RENDER_CONTROL */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2); atom->pkts[atom->npkts++] = 0x00000343; - atom->pkts[atom->npkts++] = db_cntl->db_render_control; - atom->pkts[atom->npkts++] = db_cntl->db_render_override; + atom->pkts[atom->npkts++] = depth->db_render_control; + atom->pkts[atom->npkts++] = depth->db_render_override; /* DB_SRESULTS_COMPARE_STATE1 */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 2); atom->pkts[atom->npkts++] = 0x0000034B; - atom->pkts[atom->npkts++] = db_cntl->db_sresults_compare_state1; - atom->pkts[atom->npkts++] = db_cntl->db_preload_control; + atom->pkts[atom->npkts++] = depth->db_sresults_compare_state1; + atom->pkts[atom->npkts++] = depth->db_preload_control; /* DB_ALPHA_TO_MASK */ atom->pkts[atom->npkts++] = PKT3(PKT3_SET_CONTEXT_REG, 1); atom->pkts[atom->npkts++] = 0x00000351; - atom->pkts[atom->npkts++] = db_cntl->db_alpha_to_mask; + atom->pkts[atom->npkts++] = depth->db_alpha_to_mask; fprintf(stderr, "%s %d pkts\n", __func__, atom->npkts); return 0; } diff --git a/r600_batch.c b/r600_batch.c index 4aa4c90..35c9784 100644 --- a/r600_batch.c +++ b/r600_batch.c @@ -26,7 +26,7 @@ int r600_viewport_create(struct r600_winsys *rdev, struct r600_atom *atom, void int r600_scissor_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data); int r600_blend_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data); int r600_constants_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data); -int r600_db_cntl_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data); +int r600_depth_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data); int r600_vs_shader_emit(struct r600_winsys *rdev, struct r600_atom *atom, void *data, struct radeon_ib *ib); int r600_vs_shader_create(struct r600_winsys *rdev, struct r600_atom *atom, void *data); int r600_fs_shader_emit(struct r600_winsys *rdev, struct r600_atom *atom, void *data, struct radeon_ib *ib); @@ -212,7 +212,7 @@ int r600_batches_queue(struct r600_winsys *rdev, struct r600_request *rq) i = 0; if (batch->blend == NULL || batch->cb_cntl == NULL || batch->rasterizer == NULL || batch->viewport == NULL || - batch->framebuffer == NULL || batch->db_cntl == NULL || + batch->framebuffer == NULL || batch->depth == NULL || batch->vs_shader == NULL || batch->fs_shader == NULL || batch->scissor == NULL) { free(rbatch); @@ -226,7 +226,7 @@ int r600_batches_queue(struct r600_winsys *rdev, struct r600_request *rq) rbatch->atoms[i++] = batch->scissor; rbatch->atoms[i++] = batch->vs_shader; rbatch->atoms[i++] = batch->fs_shader; - rbatch->atoms[i++] = batch->db_cntl; + rbatch->atoms[i++] = batch->depth; rbatch->atoms[i++] = batch->vs_constants; rbatch->atoms[i++] = batch->ps_constants; rbatch->atoms[i++] = batch->framebuffer; @@ -361,8 +361,8 @@ static struct r600_atom_funcs _r600_atom_funcs[] = { &r600_blend_create, &r600_atom_emit_default}, {R600_ATOM_CONSTANTS, sizeof(struct drm_r600_constants), &r600_constants_create, &r600_atom_emit_default}, - {R600_ATOM_DB_CNTL, sizeof(struct drm_r600_db_cntl), - &r600_db_cntl_create, &r600_atom_emit_default}, + {R600_ATOM_DEPTH, sizeof(struct drm_r600_depth), + &r600_depth_create, &r600_atom_emit_default}, {R600_ATOM_VS_SHADER, sizeof(struct drm_r600_vs_shader), &r600_vs_shader_create, &r600_vs_shader_emit}, {R600_ATOM_PS_SHADER, sizeof(struct drm_r600_fs_shader), diff --git a/r600_winsys.h b/r600_winsys.h index 565062f..e2627e3 100644 --- a/r600_winsys.h +++ b/r600_winsys.h @@ -34,7 +34,7 @@ struct r600_atom; #define R600_ATOM_SCISSOR 5 #define R600_ATOM_BLEND 6 #define R600_ATOM_CONSTANTS 7 -#define R600_ATOM_DB_CNTL 8 +#define R600_ATOM_DEPTH 8 #define R600_ATOM_VS_SHADER 9 #define R600_ATOM_PS_SHADER 10 #define R600_BATCH_NATOMS 11 @@ -149,8 +149,8 @@ struct drm_r600_constants { u32 constants[512]; }; -/* db_cntl - depth buffer control */ -struct drm_r600_db_cntl { +/* depth buffer control */ +struct drm_r600_depth { u32 db_stencil_clear; u32 db_depth_clear; u32 db_stencilrefmask; @@ -222,7 +222,7 @@ struct drm_r600_batch { struct r600_atom *rasterizer; struct r600_atom *viewport; struct r600_atom *scissor; - struct r600_atom *db_cntl; + struct r600_atom *depth; struct r600_atom *vs_shader; struct r600_atom *fs_shader; struct drm_r600_vs_input inputs; @@ -98,7 +98,7 @@ int r600_tri_flat(struct radeon *radeon) struct drm_r600_blend blend; struct drm_r600_framebuffer fb; struct drm_r600_cb_cntl cb_cntl; - struct drm_r600_db_cntl db_cntl; + struct drm_r600_depth depth; struct drm_r600_rasterizer pa; struct drm_r600_viewport vport; struct drm_r600_scissor scissor; @@ -250,20 +250,20 @@ int r600_tri_flat(struct radeon *radeon) rq.data = &vs_constants; batch.vs_constants = r600_atom_create(rdev, &rq); /* db rqrol */ - db_cntl.db_stencil_clear = 0x00000000; - db_cntl.db_depth_clear = 0x3F800000; - db_cntl.db_stencilrefmask = 0xFFFFFF00; - db_cntl.db_stencilrefmask_bf = 0xFFFFFF00; - db_cntl.db_depth_control = 0x00700700; - db_cntl.db_shader_control = 0x00000210; - db_cntl.db_render_control = 0x00000060; - db_cntl.db_render_override = 0x0000002A; - db_cntl.db_alpha_to_mask = 0x0000AA00; - db_cntl.db_sresults_compare_state1 = 0x00000000; - db_cntl.db_preload_control = 0x00000000; - rq.type = R600_ATOM_DB_CNTL; - rq.data = &db_cntl; - batch.db_cntl = r600_atom_create(rdev, &rq); + depth.db_stencil_clear = 0x00000000; + depth.db_depth_clear = 0x3F800000; + depth.db_stencilrefmask = 0xFFFFFF00; + depth.db_stencilrefmask_bf = 0xFFFFFF00; + depth.db_depth_control = 0x00700700; + depth.db_shader_control = 0x00000210; + depth.db_render_control = 0x00000060; + depth.db_render_override = 0x0000002A; + depth.db_alpha_to_mask = 0x0000AA00; + depth.db_sresults_compare_state1 = 0x00000000; + depth.db_preload_control = 0x00000000; + rq.type = R600_ATOM_DEPTH; + rq.data = &depth; + batch.depth = r600_atom_create(rdev, &rq); /* vs_shader */ vs_shader.ninputs = 2; vs_shader.input_semantic[0] = 1; |