diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-10-14 23:28:25 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-10-14 23:28:25 +1100 |
| commit | 690a8fe65943b74f4f19e97c98ce0ec94a9a22ac (patch) | |
| tree | 37249dbaffa4d1083c01f0de24d64c4546635819 | |
| parent | 8a65c5569d8d0c3c5306efe4fd338ae7a3086404 (diff) | |
nv04: slight thinko in last commit..
| -rw-r--r-- | src/nv_exa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nv_exa.c b/src/nv_exa.c index 8273f6d..cf00fa8 100644 --- a/src/nv_exa.c +++ b/src/nv_exa.c @@ -481,8 +481,8 @@ NVAccelUploadIFC(ScrnInfoPtr pScrn, const char *src, int src_pitch, RING_SPACE(chan, 5 + id); BEGIN_RING(chan, ifc, NV01_IMAGE_FROM_CPU_POINT, 3); OUT_RING (chan, (y++ << 16) | x); /* dst point */ - OUT_RING (chan, (h << 16) | w); /* width/height out */ - OUT_RING (chan, (h << 16) | iw); /* width/height in */ + OUT_RING (chan, (1 << 16) | w); /* width/height out */ + OUT_RING (chan, (1 << 16) | iw); /* width/height in */ BEGIN_RING(chan, ifc, NV01_IMAGE_FROM_CPU_COLOR(0), id); OUT_RINGp (chan, src, id); @@ -494,8 +494,8 @@ NVAccelUploadIFC(ScrnInfoPtr pScrn, const char *src, int src_pitch, RING_SPACE(chan, 5 + id + 1); BEGIN_RING(chan, ifc, NV01_IMAGE_FROM_CPU_POINT, 3); OUT_RING (chan, (y++ << 16) | x); /* dst point */ - OUT_RING (chan, (h << 16) | w); /* width/height out */ - OUT_RING (chan, (h << 16) | iw); /* width/height in */ + OUT_RING (chan, (1 << 16) | w); /* width/height out */ + OUT_RING (chan, (1 << 16) | iw); /* width/height in */ BEGIN_RING(chan, ifc, NV01_IMAGE_FROM_CPU_COLOR(0), id); OUT_RINGp (chan, src, id - aux); memcpy(padding, src + (id - aux) * 4, padbytes); |