diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-07-06 20:38:44 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-07-07 01:35:34 +1000 |
| commit | ec452786d9aa3b6db41f1ab3c89aaa20a758f89e (patch) | |
| tree | 2e0d99a9fb100e81290d586773e4a55d36e7ae67 /src/nv30_exa.c | |
| parent | ad56c5e27642674d8e435bbbe3d6030097a01ff9 (diff) | |
| download | xorg-driver-xf86-video-nouveau-ec452786d9aa3b6db41f1ab3c89aaa20a758f89e.tar.gz | |
nv50: de-magic things before someone accuses me of being an NVIDIA employee
Diffstat (limited to 'src/nv30_exa.c')
| -rw-r--r-- | src/nv30_exa.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nv30_exa.c b/src/nv30_exa.c index 98b4813..acb8349 100644 --- a/src/nv30_exa.c +++ b/src/nv30_exa.c @@ -515,16 +515,16 @@ NV30EXATransformCoord(PictTransformPtr t, int x, int y, float sx, float sy, } #define CV_OUTm(sx,sy,mx,my,dx,dy) do { \ - BEGIN_RING(Nv3D, NV34TCL_VERTEX_ATTR_2F_X(8), 4); \ - OUT_RINGf ((sx)); OUT_RINGf ((sy)); \ - OUT_RINGf ((mx)); OUT_RINGf ((my)); \ - BEGIN_RING(Nv3D, NV34TCL_VERTEX_ATTR_2I(0), 1); \ + BEGIN_RING(Nv3D, NV34TCL_VTX_ATTR_2F_X(8), 4); \ + OUT_RINGf ((sx)); OUT_RINGf ((sy)); \ + OUT_RINGf ((mx)); OUT_RINGf ((my)); \ + BEGIN_RING(Nv3D, NV34TCL_VTX_ATTR_2I(0), 1); \ OUT_RING (((dy)<<16)|(dx)); \ } while(0) #define CV_OUT(sx,sy,dx,dy) do { \ - BEGIN_RING(Nv3D, NV34TCL_VERTEX_ATTR_2F_X(8), 2); \ - OUT_RINGf ((sx)); OUT_RINGf ((sy)); \ - BEGIN_RING(Nv3D, NV34TCL_VERTEX_ATTR_2I(0), 1); \ + BEGIN_RING(Nv3D, NV34TCL_VTX_ATTR_2F_X(8), 2); \ + OUT_RINGf ((sx)); OUT_RINGf ((sy)); \ + BEGIN_RING(Nv3D, NV34TCL_VTX_ATTR_2I(0), 1); \ OUT_RING (((dy)<<16)|(dx)); \ } while(0) @@ -778,7 +778,7 @@ NVAccelInitNV30TCL(ScrnInfoPtr pScrn) OUT_RING (w<<16); OUT_RING (h<<16); - BEGIN_RING(Nv3D, NV34TCL_VIEWPORT_SCALE0_X, 8); + BEGIN_RING(Nv3D, NV34TCL_VIEWPORT_SCALE_X, 8); OUT_RINGf (0.0); OUT_RINGf (0.0); OUT_RINGf (0.0); |