diff options
| author | Ben Skeggs <[email protected]> | 2008-02-18 17:07:59 +1100 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-02-18 17:07:59 +1100 |
| commit | 4a9cb97bbf6961cc4106c4c54e59296a74e889e9 (patch) | |
| tree | 775f75a56b93a79b2d1cef33f1b9b098d8e8288f /src/gallium/drivers/nv40/nv40_state.c | |
| parent | 56045da083d6530a56a2a7585e3121df0b07bac4 (diff) | |
nv40: get fragprog onto new state mechanism
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 c203b002403..2886c6b0dc4 100644 --- a/src/gallium/drivers/nv40/nv40_state.c +++ b/src/gallium/drivers/nv40/nv40_state.c @@ -523,9 +523,8 @@ static void nv40_fp_state_bind(struct pipe_context *pipe, void *hwcso) { struct nv40_context *nv40 = nv40_context(pipe); - struct nv40_fragment_program *fp = hwcso; - nv40->fragprog.current = fp; + nv40->pipe_state.fragprog = hwcso; nv40->dirty |= NV40_NEW_FRAGPROG; } @@ -578,7 +577,7 @@ nv40_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index, nv40->dirty |= NV40_NEW_VERTPROG; } else if (shader == PIPE_SHADER_FRAGMENT) { - nv40->fragprog.constant_buf = buf->buffer; + nv40->pipe_state.constbuf[PIPE_SHADER_FRAGMENT] = buf->buffer; nv40->dirty |= NV40_NEW_FRAGPROG; } } |