llvmpipe: Color slot interpolation can be flat or perspective, not linear.

Fixes a bunch of glsl 1.10 interpolation piglit tests.

Signed-off-by: Olivier Galibert <galibert@pobox.com>
Signed-off-by: José Fonseca <jfonseca@vmware.com>

diff --git a/src/gallium/drivers/llvmpipe/lp_bld_interp.h b/src/gallium/drivers/llvmpipe/lp_bld_interp.h
index 5f72b0b895320a2efafe7ca773e3704ae4e868f8..b0cbd9bdaecca8eb078458919abce1237e5ce038 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_bld_interp.h
+++ b/src/gallium/drivers/llvmpipe/lp_bld_interp.h
@@ -55,7 +55,7 @@
  * src_index.
  *
  * LP_INTERP_COLOR is translated to either LP_INTERP_CONSTANT or
- * LINEAR depending on flatshade state.
+ * PERSPECTIVE depending on flatshade state.
  */
 enum lp_interp {
    LP_INTERP_CONSTANT,

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index d16952c2ec14e9286aeb6f7eb32e2fdc66b85150..11a3871c40817c20f65a809054bedee511fa4a4c 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -555,7 +555,7 @@ generate_fragment(struct llvmpipe_context *lp,
         if (key->flatshade)
            inputs[i].interp = LP_INTERP_CONSTANT;
         else
-           inputs[i].interp = LP_INTERP_LINEAR;
+           inputs[i].interp = LP_INTERP_PERSPECTIVE;
       }
    }
 

diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.c b/src/gallium/drivers/llvmpipe/lp_state_setup.c
index ab38357872d3990c0ac6db03137d98683022a19b..212bc1b9d05f49074cc1a427f757a9d3a7d8a4db 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_state_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_setup.c
@@ -790,7 +790,7 @@ lp_make_setup_variant_key(struct llvmpipe_context *lp,
          if (lp->rasterizer->flatshade)
            key->inputs[i].interp = LP_INTERP_CONSTANT;
         else
-           key->inputs[i].interp = LP_INTERP_LINEAR;
+           key->inputs[i].interp = LP_INTERP_PERSPECTIVE;
       }
    }