diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2012-05-16 20:52:41 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2012-05-17 15:24:58 +0200 |
| commit | fcb28682101dfa127486373411043d5d97a0ff8f (patch) | |
| tree | 178155b68e55c7d7278c70cff3569c985677d428 /src/gallium/drivers/nv50/nv50_screen.c | |
| parent | 07323a80a258372875e61f73a4f745374bea6bda (diff) | |
| download | external_mesa3d-fcb28682101dfa127486373411043d5d97a0ff8f.zip external_mesa3d-fcb28682101dfa127486373411043d5d97a0ff8f.tar.gz external_mesa3d-fcb28682101dfa127486373411043d5d97a0ff8f.tar.bz2 | |
nv50,nvc0: handle user constbufs without wrapping them in a resource
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_screen.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_screen.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c index c96e028..9f356ff 100644 --- a/src/gallium/drivers/nv50/nv50_screen.c +++ b/src/gallium/drivers/nv50/nv50_screen.c @@ -196,7 +196,7 @@ nv50_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, case PIPE_SHADER_CAP_MAX_CONSTS: return 65536 / 16; case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: - return 14; + return NV50_MAX_PIPE_CONSTBUFS; case PIPE_SHADER_CAP_MAX_ADDRS: return 1; case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR: @@ -437,10 +437,7 @@ nv50_screen_init_hwctx(struct nv50_screen *screen, unsigned tls_space) PUSH_DATA (push, screen->uniforms->offset + (3 << 16)); PUSH_DATA (push, (NV50_CB_AUX << 16) | 0x0200); - BEGIN_NI04(push, NV50_3D(SET_PROGRAM_CB), 6); - PUSH_DATA (push, (NV50_CB_PVP << 12) | 0x001); - PUSH_DATA (push, (NV50_CB_PGP << 12) | 0x021); - PUSH_DATA (push, (NV50_CB_PFP << 12) | 0x031); + BEGIN_NI04(push, NV50_3D(SET_PROGRAM_CB), 3); PUSH_DATA (push, (NV50_CB_AUX << 12) | 0xf01); PUSH_DATA (push, (NV50_CB_AUX << 12) | 0xf21); PUSH_DATA (push, (NV50_CB_AUX << 12) | 0xf31); |