projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported the Savage DRI driver from the savage-2-0-0-branch of DRI CVS
[mesa.git]
/
src
/
mesa
/
main
/
nvvertexec.c
diff --git
a/src/mesa/main/nvvertexec.c
b/src/mesa/main/nvvertexec.c
index fd1519e9a87681f3520658612069500acdc1d649..9663b38157df1de60c754b704fc925cf69bcea98 100644
(file)
--- a/
src/mesa/main/nvvertexec.c
+++ b/
src/mesa/main/nvvertexec.c
@@
-1,6
+1,6
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 6.0
+ * Version: 6.0
.1
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
@@
-326,8
+326,16
@@
store_vector4( const struct vp_dst_register *dest,
case PROGRAM_OUTPUT:
dst = state->Outputs[dest->Index];
break;
case PROGRAM_OUTPUT:
dst = state->Outputs[dest->Index];
break;
+ case PROGRAM_ENV_PARAM:
+ {
+ /* a slight hack */
+ GET_CURRENT_CONTEXT(ctx);
+ dst = ctx->VertexProgram.Parameters[dest->Index];
+ }
+ break;
default:
default:
- _mesa_problem(NULL, "Invalid register file in fetch_vector1(vp)");
+ _mesa_problem(NULL, "Invalid register file in store_vector4(file=%d)",
+ dest->File);
return;
}
return;
}