diff options
| author | Marek Olšák <[email protected]> | 2010-04-15 23:58:38 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2010-04-15 23:58:38 +0200 |
| commit | 17b41f80bd1e9306de625e4240e6d83c08eec7fd (patch) | |
| tree | da8606f4366b074d348da43fd9e4269d4e27622b | |
| parent | 85cbff5b60c79731a583104a0c2b32ee149b8c8c (diff) | |
r300/compiler: kill off RC_WRAP_CLAMP
A variant thereof might be later reintroduced for the mirrored-clamp modes.
| -rw-r--r-- | src/gallium/drivers/r300/r300_fs.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/r300_fragprog.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/r500_fragprog.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/radeon_code.h | 1 |
4 files changed, 2 insertions, 9 deletions
diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c index cf81771bb7b..01fd67e536b 100644 --- a/src/gallium/drivers/r300/r300_fs.c +++ b/src/gallium/drivers/r300/r300_fs.c @@ -169,12 +169,6 @@ static void get_external_state( state->unit[i].fake_npot = TRUE; */ break; - case PIPE_TEX_WRAP_CLAMP: - case PIPE_TEX_WRAP_CLAMP_TO_EDGE: - case PIPE_TEX_WRAP_CLAMP_TO_BORDER: - state->unit[i].wrap_mode = RC_WRAP_CLAMP; - break; - case PIPE_TEX_WRAP_MIRROR_REPEAT: case PIPE_TEX_WRAP_MIRROR_CLAMP: case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE: diff --git a/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c index 50360de3a38..b2cb9168807 100644 --- a/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c +++ b/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c @@ -174,7 +174,7 @@ int r300_transform_TEX( } if (compiler->state.unit[inst->U.I.TexSrcUnit].fake_npot && - wrapmode != RC_WRAP_NONE && wrapmode != RC_WRAP_CLAMP) { + wrapmode != RC_WRAP_NONE) { if (wrapmode == RC_WRAP_REPEAT) { inst_rect = rc_insert_new_instruction(c, inst->Prev); diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c index 647bc87d0b7..295e455d900 100644 --- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c +++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c @@ -177,7 +177,7 @@ int r500_transform_TEX( unsigned temp = rc_find_free_temporary(c); if (compiler->state.unit[inst->U.I.TexSrcUnit].fake_npot && - wrapmode != RC_WRAP_NONE && wrapmode != RC_WRAP_CLAMP) { + wrapmode != RC_WRAP_NONE) { if ((inst->U.I.TexSrcTarget == RC_TEXTURE_RECT || compiler->state.unit[inst->U.I.TexSrcUnit].non_normalized_coords)) { diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_code.h b/src/mesa/drivers/dri/r300/compiler/radeon_code.h index 0a20dfe2d1a..28bcd1029bb 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_code.h +++ b/src/mesa/drivers/dri/r300/compiler/radeon_code.h @@ -114,7 +114,6 @@ typedef enum { */ typedef enum { RC_WRAP_NONE = 0, - RC_WRAP_CLAMP, RC_WRAP_REPEAT, RC_WRAP_MIRROR } rc_wrap_mode; |