diff options
| author | Marek Olšák <[email protected]> | 2012-02-14 15:14:58 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-02-14 15:49:24 +0100 |
| commit | d214275aceed3afd1174cd2a1b823d4b7357de2a (patch) | |
| tree | 55ad33eefd452073425bf15da19de3f52656d7f4 /src/gallium | |
| parent | 85571ed53c18f4e5c31ea8eb81c1231c6d786ae4 (diff) | |
r600g: inline r600_translate_ds_func
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 1d13547f4de..5c28720ebc8 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -173,12 +173,6 @@ static uint32_t r600_translate_blend_factor(int blend_fact) return 0; } -/* translates straight */ -static uint32_t r600_translate_ds_func(int func) -{ - return func; -} - static unsigned r600_tex_wrap(unsigned wrap) { switch (wrap) { @@ -834,14 +828,14 @@ static void *evergreen_create_dsa_state(struct pipe_context *ctx, /* stencil */ if (state->stencil[0].enabled) { db_depth_control |= S_028800_STENCIL_ENABLE(1); - db_depth_control |= S_028800_STENCILFUNC(r600_translate_ds_func(state->stencil[0].func)); + db_depth_control |= S_028800_STENCILFUNC(state->stencil[0].func); /* translates straight */ db_depth_control |= S_028800_STENCILFAIL(r600_translate_stencil_op(state->stencil[0].fail_op)); db_depth_control |= S_028800_STENCILZPASS(r600_translate_stencil_op(state->stencil[0].zpass_op)); db_depth_control |= S_028800_STENCILZFAIL(r600_translate_stencil_op(state->stencil[0].zfail_op)); if (state->stencil[1].enabled) { db_depth_control |= S_028800_BACKFACE_ENABLE(1); - db_depth_control |= S_028800_STENCILFUNC_BF(r600_translate_ds_func(state->stencil[1].func)); + db_depth_control |= S_028800_STENCILFUNC_BF(state->stencil[1].func); /* translates straight */ db_depth_control |= S_028800_STENCILFAIL_BF(r600_translate_stencil_op(state->stencil[1].fail_op)); db_depth_control |= S_028800_STENCILZPASS_BF(r600_translate_stencil_op(state->stencil[1].zpass_op)); db_depth_control |= S_028800_STENCILZFAIL_BF(r600_translate_stencil_op(state->stencil[1].zfail_op)); diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 03cb780aa65..823eb9c25bb 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -116,12 +116,6 @@ static uint32_t r600_translate_blend_factor(int blend_fact) return 0; } -/* translates straight */ -static uint32_t r600_translate_ds_func(int func) -{ - return func; -} - static unsigned r600_tex_wrap(unsigned wrap) { switch (wrap) { @@ -834,14 +828,14 @@ static void *r600_create_dsa_state(struct pipe_context *ctx, /* stencil */ if (state->stencil[0].enabled) { db_depth_control |= S_028800_STENCIL_ENABLE(1); - db_depth_control |= S_028800_STENCILFUNC(r600_translate_ds_func(state->stencil[0].func)); + db_depth_control |= S_028800_STENCILFUNC(state->stencil[0].func); /* translates straight */ db_depth_control |= S_028800_STENCILFAIL(r600_translate_stencil_op(state->stencil[0].fail_op)); db_depth_control |= S_028800_STENCILZPASS(r600_translate_stencil_op(state->stencil[0].zpass_op)); db_depth_control |= S_028800_STENCILZFAIL(r600_translate_stencil_op(state->stencil[0].zfail_op)); if (state->stencil[1].enabled) { db_depth_control |= S_028800_BACKFACE_ENABLE(1); - db_depth_control |= S_028800_STENCILFUNC_BF(r600_translate_ds_func(state->stencil[1].func)); + db_depth_control |= S_028800_STENCILFUNC_BF(state->stencil[1].func); /* translates straight */ db_depth_control |= S_028800_STENCILFAIL_BF(r600_translate_stencil_op(state->stencil[1].fail_op)); db_depth_control |= S_028800_STENCILZPASS_BF(r600_translate_stencil_op(state->stencil[1].zpass_op)); db_depth_control |= S_028800_STENCILZFAIL_BF(r600_translate_stencil_op(state->stencil[1].zfail_op)); |