Merge branch '7.8'

[mesa.git] / src / mesa / drivers / dri / r300 / compiler / radeon_code.h

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_code.h b/src/mesa/drivers/dri/r300/compiler/radeon_code.h
index 45cc7df1e310d08174edec5c3e03d43a0802e1dc..27274f07122d32b5985103d3ce387804e7ba4073 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_code.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_code.h
@@ -114,9 +114,9 @@ typedef enum {
  */
 typedef enum {
        RC_WRAP_NONE = 0,
-       RC_WRAP_CLAMP,
        RC_WRAP_REPEAT,
-       RC_WRAP_MIRROR
+       RC_WRAP_MIRRORED_REPEAT,
+       RC_WRAP_MIRRORED_CLAMP
 } rc_wrap_mode;
 
 /**
@@ -144,7 +144,12 @@ struct r300_fragment_program_external_state {
                unsigned texture_compare_func : 3;
 
                /**
-                * If the sampler will be accessed with non-normalized coords,
+                * If the sampler needs to fake NPOT, this field is set.
+                */
+               unsigned fake_npot : 1;
+
+               /**
+                * If the sampler will recieve non-normalized coords,
                 * this field is set.
                 */
                unsigned non_normalized_coords : 1;