r600g: fixup tex wrapping.

the clamp edge/clamp cases were reversed.

diff --git a/src/gallium/drivers/r600/eg_state_inlines.h b/src/gallium/drivers/r600/eg_state_inlines.h
index 4723aee..251e64a 100644 (file)
--- a/src/gallium/drivers/r600/eg_state_inlines.h
+++ b/src/gallium/drivers/r600/eg_state_inlines.h
@@ -136,17 +136,17 @@ static inline unsigned r600_tex_wrap(unsigned wrap)
        case PIPE_TEX_WRAP_REPEAT:
                return V_03C000_SQ_TEX_WRAP;
        case PIPE_TEX_WRAP_CLAMP:
-               return V_03C000_SQ_TEX_CLAMP_LAST_TEXEL;
-       case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
                return V_03C000_SQ_TEX_CLAMP_HALF_BORDER;
+       case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
+               return V_03C000_SQ_TEX_CLAMP_LAST_TEXEL;
        case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
                return V_03C000_SQ_TEX_CLAMP_BORDER;
        case PIPE_TEX_WRAP_MIRROR_REPEAT:
                return V_03C000_SQ_TEX_MIRROR;
        case PIPE_TEX_WRAP_MIRROR_CLAMP:
-               return V_03C000_SQ_TEX_MIRROR_ONCE_LAST_TEXEL;
-       case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
                return V_03C000_SQ_TEX_MIRROR_ONCE_HALF_BORDER;
+       case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
+               return V_03C000_SQ_TEX_MIRROR_ONCE_LAST_TEXEL;
        case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER:
                return V_03C000_SQ_TEX_MIRROR_ONCE_BORDER;
        }

diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h
index 663529f..3be5248 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_inlines.h
+++ b/src/gallium/drivers/r600/r600_state_inlines.h
@@ -136,17 +136,17 @@ static inline unsigned r600_tex_wrap(unsigned wrap)
        case PIPE_TEX_WRAP_REPEAT:
                return V_03C000_SQ_TEX_WRAP;
        case PIPE_TEX_WRAP_CLAMP:
-               return V_03C000_SQ_TEX_CLAMP_LAST_TEXEL;
-       case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
                return V_03C000_SQ_TEX_CLAMP_HALF_BORDER;
+       case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
+               return V_03C000_SQ_TEX_CLAMP_LAST_TEXEL;
        case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
                return V_03C000_SQ_TEX_CLAMP_BORDER;
        case PIPE_TEX_WRAP_MIRROR_REPEAT:
                return V_03C000_SQ_TEX_MIRROR;
        case PIPE_TEX_WRAP_MIRROR_CLAMP:
-               return V_03C000_SQ_TEX_MIRROR_ONCE_LAST_TEXEL;
-       case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
                return V_03C000_SQ_TEX_MIRROR_ONCE_HALF_BORDER;
+       case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
+               return V_03C000_SQ_TEX_MIRROR_ONCE_LAST_TEXEL;
        case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER:
                return V_03C000_SQ_TEX_MIRROR_ONCE_BORDER;
        }