Mesa (gallium-0.2): softpipe: Fix function prototype.

Michał Król michal at kemper.freedesktop.org
Tue Nov 25 12:16:59 UTC 2008


Module: Mesa
Branch: gallium-0.2
Commit: 152db5b8846c38d8bcd85d39927e810da7bf1169
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=152db5b8846c38d8bcd85d39927e810da7bf1169

Author: Michal Krol <michal at tungstengraphics.com>
Date:   Tue Nov 25 13:01:06 2008 +0100

softpipe: Fix function prototype.

---

 src/gallium/drivers/softpipe/sp_quad_fs.c |    2 +-
 src/gallium/drivers/softpipe/sp_state.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_quad_fs.c b/src/gallium/drivers/softpipe/sp_quad_fs.c
index 730fa0c..963a2b4 100644
--- a/src/gallium/drivers/softpipe/sp_quad_fs.c
+++ b/src/gallium/drivers/softpipe/sp_quad_fs.c
@@ -151,7 +151,7 @@ static void shade_begin(struct quad_stage *qs)
 
    softpipe->fs->prepare( softpipe->fs, 
 			  &qss->machine,
-			  qss->samplers_list );
+			  (struct tgsi_sampler **) qss->samplers_list );
 
    qs->next->begin(qs->next);
 }
diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index 476ef3d..3eff41f 100644
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -69,7 +69,7 @@ struct sp_fragment_shader {
 
    void (*prepare)( const struct sp_fragment_shader *shader,
 		    struct tgsi_exec_machine *machine,
-		    struct tgsi_sampler *samplers);
+		    struct tgsi_sampler **samplers);
 
    /* Run the shader - this interface will get cleaned up in the
     * future:




More information about the mesa-commit mailing list