diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-28 18:32:46 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-28 18:32:46 +1100 |
| commit | 3e39bc3d87a82d81ffaf383303ada32e530b879e (patch) | |
| tree | 530249743415875917c0ebbf53eaf92d7901bd2d /src/mesa/pipe/nv40/nv40_fragprog.c | |
| parent | a556034514582dc8e1b8b65f56020031d513331b (diff) | |
nouveau: quicky-port to gallium changes
Diffstat (limited to 'src/mesa/pipe/nv40/nv40_fragprog.c')
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_fragprog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/pipe/nv40/nv40_fragprog.c b/src/mesa/pipe/nv40/nv40_fragprog.c index fded11d170..714634396d 100644 --- a/src/mesa/pipe/nv40/nv40_fragprog.c +++ b/src/mesa/pipe/nv40/nv40_fragprog.c @@ -769,7 +769,7 @@ nv40_fragprog_bind(struct nv40_context *nv40, struct nv40_fragment_program *fp) if (fp->nr_consts) { float *map = ws->buffer_map(ws, nv40->fragprog.constant_buf, - PIPE_BUFFER_FLAG_READ); + PIPE_BUFFER_USAGE_CPU_READ); for (i = 0; i < fp->nr_consts; i++) { struct nv40_fragment_program_data *fpd = &fp->consts[i]; uint32_t *p = &fp->insn[fpd->offset]; @@ -788,10 +788,10 @@ nv40_fragprog_bind(struct nv40_context *nv40, struct nv40_fragment_program *fp) uint32_t *map; if (!fp->buffer) - fp->buffer = ws->buffer_create(ws, 0x100, 0, 0); - ws->buffer_data(ws, fp->buffer, fp->insn_len * 4, NULL, 0); - - map = ws->buffer_map(ws, fp->buffer, PIPE_BUFFER_FLAG_WRITE); + fp->buffer = ws->buffer_create(ws, 0x100, 0, + fp->insn_len * 4); + map = ws->buffer_map(ws, fp->buffer, + PIPE_BUFFER_USAGE_CPU_WRITE); #if 0 for (i = 0; i < fp->insn_len; i++) { |