add lambda param to get_sample()

diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/mesa/pipe/softpipe/sp_tex_sample.c
index df64c81769b521a62ee40980510e097dfd2747b2..1d274d50384aaa40dab91ec15feaf01620474bfd 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_tex_sample.c
+++ b/src/mesa/pipe/softpipe/sp_tex_sample.c
@@ -411,7 +411,7 @@ choose_cube_face(const GLfloat texcoord[4], GLfloat newCoord[4])
 
 static void
 sp_get_sample_1d(struct tgsi_sampler *sampler,
-                 const GLfloat strq[4], GLfloat rgba[4])
+                 const GLfloat strq[4], GLfloat lambda, GLfloat rgba[4])
 {
    struct pipe_context *pipe = (struct pipe_context *) sampler->pipe;
    struct pipe_surface *ps
@@ -460,9 +460,9 @@ sp_get_sample_1d(struct tgsi_sampler *sampler,
  * The update_samplers() function in st_atom_sampler.c could create
  * a new tgsi_sampler object for each state combo it finds....
  */
-void
+static void
 sp_get_sample_2d(struct tgsi_sampler *sampler,
-                 const GLfloat strq[4], GLfloat rgba[4])
+                 const GLfloat strq[4], GLfloat lambda, GLfloat rgba[4])
 {
    struct pipe_context *pipe = (struct pipe_context *) sampler->pipe;
    struct pipe_surface *ps
@@ -507,7 +507,7 @@ sp_get_sample_2d(struct tgsi_sampler *sampler,
 
 static void
 sp_get_sample_3d(struct tgsi_sampler *sampler,
-                 const GLfloat strq[4], GLfloat rgba[4])
+                 const GLfloat strq[4], GLfloat lamba, GLfloat rgba[4])
 {
    /* get/map pipe_surfaces corresponding to 3D tex slices */
 }
@@ -515,7 +515,7 @@ sp_get_sample_3d(struct tgsi_sampler *sampler,
 
 static void
 sp_get_sample_cube(struct tgsi_sampler *sampler,
-                   const GLfloat strq[4], GLfloat rgba[4])
+                   const GLfloat strq[4], GLfloat lambda, GLfloat rgba[4])
 {
    GLfloat st[4];
    GLuint face = choose_cube_face(strq, st);
@@ -526,20 +526,20 @@ sp_get_sample_cube(struct tgsi_sampler *sampler,
 
 void
 sp_get_sample(struct tgsi_sampler *sampler,
-              const GLfloat strq[4], GLfloat rgba[4])
+              const GLfloat strq[4], GLfloat lambda, GLfloat rgba[4])
 {
    switch (sampler->texture->target) {
    case GL_TEXTURE_1D:
-      sp_get_sample_1d(sampler, strq, rgba);
+      sp_get_sample_1d(sampler, strq, lambda, rgba);
       break;
    case GL_TEXTURE_2D:
-      sp_get_sample_2d(sampler, strq, rgba);
+      sp_get_sample_2d(sampler, strq, lambda, rgba);
       break;
    case GL_TEXTURE_3D:
-      sp_get_sample_3d(sampler, strq, rgba);
+      sp_get_sample_3d(sampler, strq, lambda, rgba);
       break;
    case GL_TEXTURE_CUBE_MAP:
-      sp_get_sample_cube(sampler, strq, rgba);
+      sp_get_sample_cube(sampler, strq, lambda, rgba);
       break;
    default:
       assert(0);

diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.h b/src/mesa/pipe/softpipe/sp_tex_sample.h
index d1d40e4a2f66f815538450e542ffc9a2478e0722..55ae49094b04ed2504bc9058d12c2bea89883291 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_tex_sample.h
+++ b/src/mesa/pipe/softpipe/sp_tex_sample.h
@@ -7,7 +7,7 @@ struct tgsi_sampler;
 
 extern void
 sp_get_sample(struct tgsi_sampler *sampler,
-              const GLfloat strq[4], GLfloat rgba[4]);
+              const GLfloat strq[4], GLfloat lambda, GLfloat rgba[4]);
 
 
 #endif /* SP_TEX_SAMPLE_H */