diff options
| author | Roland Scheidegger <rscheidegger@gmx.ch> | 2004-06-02 22:09:11 +0000 |
|---|---|---|
| committer | Roland Scheidegger <rscheidegger@gmx.ch> | 2004-06-02 22:09:11 +0000 |
| commit | 48ccaf200940613032dfaaafe71382947f398004 (patch) | |
| tree | 066db030b26c58cb91ab01c29996059bbbcd46b4 /src/mesa/drivers/dri/r200/r200_tcl.c | |
| parent | 2665a4e74ca0aa56f21ddc91eacc83ec2472cbda (diff) | |
add support for more than 2 texture units (max 6, default 4). use hang workarounds only for r200, not derivatives.
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_tcl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_tcl.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c index 1090666dd3..85f4bc1f7d 100644 --- a/src/mesa/drivers/dri/r200/r200_tcl.c +++ b/src/mesa/drivers/dri/r200/r200_tcl.c @@ -419,10 +419,13 @@ static void transition_to_swtnl( GLcontext *ctx ) R200_STATECHANGE( rmesa, set ); rmesa->hw.set.cmd[SET_RE_CNTL] |= (R200_VTX_STQ0_D3D | - R200_VTX_STQ1_D3D); + R200_VTX_STQ1_D3D | + R200_VTX_STQ2_D3D | + R200_VTX_STQ3_D3D | + R200_VTX_STQ4_D3D | + R200_VTX_STQ5_D3D); } - static void transition_to_hwtnl( GLcontext *ctx ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); @@ -454,7 +457,11 @@ static void transition_to_hwtnl( GLcontext *ctx ) R200_STATECHANGE( rmesa, set ); rmesa->hw.set.cmd[SET_RE_CNTL] &= ~(R200_VTX_STQ0_D3D | - R200_VTX_STQ1_D3D); + R200_VTX_STQ1_D3D | + R200_VTX_STQ2_D3D | + R200_VTX_STQ3_D3D | + R200_VTX_STQ4_D3D | + R200_VTX_STQ5_D3D); if (R200_DEBUG & DEBUG_FALLBACKS) @@ -470,7 +477,11 @@ static char *fallbackStrings[] = { "Texgen unit 0", "Texgen unit 1", "Texgen unit 2", - "User disable" + "Texgen unit 3", + "Texgen unit 4", + "Texgen unit 5", + "User disable", + "Bitmap as points" }; |