r300/compiler: kill off RC_WRAP_CLAMP

A variant thereof might be later reintroduced for the mirrored-clamp modes.

diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c
index cf81771bb7b5afe4dd4cba343fdefbfd0e505c1c..01fd67e536b75a4058c787be9332cbb8b7127358 100644 (file)
--- 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 50360de3a380818dea9e27e44ee992ea21e3a884..b2cb9168807c3c2e220c11c0b600ead4e2e1c5cb 100644 (file)
--- 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 647bc87d0b72e4c5c6541f77a88809c99a532fef..295e455d900f2a871cdd76de08468ad9f967caf1 100644 (file)
--- 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 0a20dfe2d1ae57b4feaee0cfdf40d2c34aa8224a..28bcd1029bb2c89ca01e7ecc4e12a39fe2757c98 100644 (file)
--- 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;