diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-02-06 06:04:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-02-06 06:04:13 +1000 |
| commit | 470cd6a401c6a3e8fea981a8fe97c28be3cfb81d (patch) | |
| tree | e0ba35d1847529fa8754a22f079f166bbd95e150 /src/radeon_commonfuncs.c | |
| parent | f65e8dfac23adfa199026765fe3a1ea08cf4da67 (diff) | |
r300: remove r300 specific vertex emission
Set the vertex and fragment engine to expect the mask coords.
Diffstat (limited to 'src/radeon_commonfuncs.c')
| -rw-r--r-- | src/radeon_commonfuncs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c index 53bbce94..53c428aa 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -97,8 +97,10 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) OUT_ACCEL_REG(R300_VAP_CNTL, 0x300456); OUT_ACCEL_REG(R300_VAP_VTE_CNTL, 0x300); OUT_ACCEL_REG(R300_VAP_PSC_SGN_NORM_CNTL, 0x0); - OUT_ACCEL_REG(R300_VAP_PROG_STREAM_CNTL_0, 0x6a014001); + OUT_ACCEL_REG(R300_VAP_PROG_STREAM_CNTL_0, 0x4a014001); + OUT_ACCEL_REG(R300_VAP_PROG_STREAM_CNTL_1, 0x6b01); OUT_ACCEL_REG(R300_VAP_PROG_STREAM_CNTL_EXT_0, 0xf688f688); + OUT_ACCEL_REG(R300_VAP_PROG_STREAM_CNTL_EXT_1, 0xf688); OUT_ACCEL_REG(R300_VAP_PVS_CODE_CNTL_0, 0x100400); OUT_ACCEL_REG(R300_VAP_PVS_CODE_CNTL_1, 0x1); OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_INDX_REG, 0); @@ -113,7 +115,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) OUT_ACCEL_REG(R300_VAP_PVS_FLOW_CNTL_OPC, 0x0); OUT_ACCEL_REG(R300_VAP_OUT_VTX_FMT_0, 0x1); - OUT_ACCEL_REG(R300_VAP_OUT_VTX_FMT_1, 0x2); + OUT_ACCEL_REG(R300_VAP_OUT_VTX_FMT_1, (0x2 << 3) | 0x2); OUT_ACCEL_REG(R300_VAP_GB_VERT_CLIP_ADJ, 0x3f800000); OUT_ACCEL_REG(R300_VAP_GB_VERT_DISC_ADJ, 0x3f800000); |