aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-05 08:12:52 +0200
committermarha <marha@users.sourceforge.net>2011-08-05 08:12:52 +0200
commitd105412503ea250e07d3cb008f10f60e6e48bf8a (patch)
tree8601f1f1f77b22249cbfdecb20b52aa8bc69bd5a /mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
parent9b009a8bdb31d08e3d07f68416373b9aa6f85724 (diff)
downloadvcxsrv-d105412503ea250e07d3cb008f10f60e6e48bf8a.tar.gz
vcxsrv-d105412503ea250e07d3cb008f10f60e6e48bf8a.tar.bz2
vcxsrv-d105412503ea250e07d3cb008f10f60e6e48bf8a.zip
mesa pixman git update 5 aug 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
index a41e5b16a..656c985d7 100644
--- a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -267,7 +267,7 @@ src_register( struct st_translate *t,
/**
* Map mesa texture target to TGSI texture target.
*/
-static unsigned
+unsigned
translate_texture_target( GLuint textarget,
GLboolean shadow )
{
@@ -511,7 +511,7 @@ static void emit_ddy( struct st_translate *t,
-static unsigned
+unsigned
translate_opcode( unsigned op )
{
switch( op ) {
@@ -1207,7 +1207,7 @@ st_translate_mesa_program(
else
t->constants[i] =
ureg_DECL_immediate( ureg,
- program->Parameters->ParameterValues[i],
+ (const float*) program->Parameters->ParameterValues[i],
4 );
break;
default: