diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2007-07-17 11:06:31 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-07-17 11:06:31 +0100 |
| commit | 6101fe641cd506422d0b2735dfcaa61174684ec4 (patch) | |
| tree | 78f14b3d199fbb9133076798dcd49e5992327d2e /src/mesa/drivers/dri/nouveau/nv10_state.c | |
| parent | bb1b01616b6cb9b0a1cab74e10940ce346cb8a3d (diff) | |
| parent | 7b410f366fa117a03a7e838562215d2dca3f8cbc (diff) | |
Merge branch 'origin' into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_state.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c index 5f304ccab9..47c4b14ba6 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_state.c +++ b/src/mesa/drivers/dri/nouveau/nv10_state.c @@ -697,8 +697,7 @@ static GLboolean nv10InitCard(nouveauContextPtr nmesa) BEGIN_RING_SIZE(NvSub3D, 0x03f4, 1); OUT_RING(0); - /* not for nv10, only for >= nv11 */ - if ((nmesa->screen->card->id>>4) >= 0x11) { + if (nmesa->screen->card->type >= NV_11) { BEGIN_RING_SIZE(NvSub3D, 0x120, 3); OUT_RING(0); OUT_RING(1); @@ -739,11 +738,11 @@ static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color, OUT_RING_CACHE(depth ? depth->offset : color[0]->offset); /* Always set to bottom left of buffer */ - BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_ORIGIN_X, 4); + /*BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_ORIGIN_X, 4); OUT_RING_CACHEf (0.0); OUT_RING_CACHEf ((GLfloat) h); OUT_RING_CACHEf (0.0); - OUT_RING_CACHEf (0.0); + OUT_RING_CACHEf (0.0);*/ return GL_TRUE; } |