summaryrefslogtreecommitdiff
path: root/src/nv30_exa.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-04-17 09:30:49 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-04-17 11:28:07 +1000
commitec019b3a50475b7ff1b5e0a5dbe14e5ef677bd9e (patch)
tree69b9d11c5b8c43025b077784f6d4a62626d58c38 /src/nv30_exa.c
parentfb3a36b1e5af0f81bb266da894d3442eed8e4e55 (diff)
Keep a single buffer for random accel data, rather than 3 different ones
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'src/nv30_exa.c')
-rw-r--r--src/nv30_exa.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/nv30_exa.c b/src/nv30_exa.c
index 725a66a..7ac318c 100644
--- a/src/nv30_exa.c
+++ b/src/nv30_exa.c
@@ -629,10 +629,11 @@ NVAccelInitNV30TCL(ScrnInfoPtr pScrn)
struct nouveau_pushbuf *push = pNv->pushbuf;
struct nv04_fifo *fifo = pNv->channel->data;
uint32_t class = 0, chipset;
- int next_hw_offset = 0, i;
+ int next_hw_offset = FRAGPROG, i;
if (!nv40_fp_map_a8[0])
NV30EXAHackupA8Shaders(pScrn);
+ NVXVComputeBicubicFilter(pNv->scratch, XV_TABLE, XV_TABLE_SIZE);
#define NV30TCL_CHIPSET_3X_MASK 0x00000003
#define NV35TCL_CHIPSET_3X_MASK 0x000001e0
@@ -658,14 +659,6 @@ NVAccelInitNV30TCL(ScrnInfoPtr pScrn)
if (nouveau_object_new(pNv->channel, Nv3D, class, NULL, 0, &pNv->Nv3D))
return FALSE;
- if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_MAP,
- 0, 0x1000, NULL, &pNv->shader_mem)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Couldn't alloc fragprog buffer!\n");
- nouveau_object_del(&pNv->Nv3D);
- return FALSE;
- }
-
if (!PUSH_SPACE(push, 256))
return FALSE;