diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-06 15:06:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-06 15:06:25 +1000 |
| commit | fc47cb9d710c046d34e8238337e009d7b76a3207 (patch) | |
| tree | e19d3d359c1ccfd6d65c7d15f1435ad5830d47fd /src/gallium/drivers/r600/r600_state.c | |
| parent | b8de7788a4b20c702b06402e2e6eed60467e2522 (diff) | |
r600g: fixup z format translations.
this enables GL_EXT_packed_depth_stencil. fbo-d24s8 passes
Diffstat (limited to 'src/gallium/drivers/r600/r600_state.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index e43e4afe55..82145617ca 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -706,22 +706,6 @@ static int r600_cb0(struct r600_context *rctx, struct radeon_state *rstate) return radeon_state_pm4(rstate); } -static int r600_db_format(unsigned pformat, unsigned *format) -{ - switch (pformat) { - case PIPE_FORMAT_Z24X8_UNORM: - *format = V_028010_DEPTH_X8_24; - return 0; - case PIPE_FORMAT_Z24_UNORM_S8_USCALED: - *format = V_028010_DEPTH_8_24; - return 0; - default: - *format = V_028010_DEPTH_INVALID; - R600_ERR("unsupported %d\n", pformat); - return -EINVAL; - } -} - static int r600_db(struct r600_context *rctx, struct radeon_state *rstate) { struct r600_screen *rscreen = rctx->screen; @@ -746,9 +730,7 @@ static int r600_db(struct r600_context *rctx, struct radeon_state *rstate) level = state->zsbuf->level; pitch = (rtex->pitch[level] / rtex->bpt) / 8 - 1; slice = (rtex->pitch[level] / rtex->bpt) * state->zsbuf->height / 64 - 1; - if (r600_db_format(state->zsbuf->texture->format, &format)) { - return -EINVAL; - } + format = r600_translate_dbformat(state->zsbuf->texture->format); rstate->states[R600_DB__DB_DEPTH_BASE] = 0x00000000; rstate->states[R600_DB__DB_DEPTH_INFO] = 0x00010000 | S_028010_FORMAT(format); |