diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-18 17:36:24 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-18 17:36:24 +1100 |
| commit | 9a5dd26fe22c37b85787130a2b724e6e8ef4f553 (patch) | |
| tree | c3c8d0c735b1b24b9bbb0472318cbef671737997 /src/gallium/drivers/nv40/nv40_state.c | |
| parent | 4a9cb97bbf6961cc4106c4c54e59296a74e889e9 (diff) | |
| download | mesa-9a5dd26fe22c37b85787130a2b724e6e8ef4f553.tar.gz | |
nv40: and vertprog..
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_state.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c index 2886c6b0dc4..8ffbb131f73 100644 --- a/src/gallium/drivers/nv40/nv40_state.c +++ b/src/gallium/drivers/nv40/nv40_state.c @@ -491,9 +491,8 @@ static void nv40_vp_state_bind(struct pipe_context *pipe, void *hwcso) { struct nv40_context *nv40 = nv40_context(pipe); - struct nv40_vertex_program *vp = hwcso; - nv40->vertprog.current = vp; + nv40->pipe_state.vertprog = hwcso; nv40->dirty |= NV40_NEW_VERTPROG; } @@ -573,7 +572,7 @@ nv40_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index, struct nv40_context *nv40 = nv40_context(pipe); if (shader == PIPE_SHADER_VERTEX) { - nv40->vertprog.constant_buf = buf->buffer; + nv40->pipe_state.constbuf[PIPE_SHADER_VERTEX] = buf->buffer; nv40->dirty |= NV40_NEW_VERTPROG; } else if (shader == PIPE_SHADER_FRAGMENT) { |