diff options
| author | Ilia Mirkin <[email protected]> | 2014-02-12 18:22:56 -0500 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-02-13 11:06:41 -0500 |
| commit | 0c8b165366d68291e3013c7308b8b1fdd5ade2a2 (patch) | |
| tree | f7ad0563a5424ebbf0fd7f0bac44a995df078b00 /src/mesa/drivers/dri/nouveau/nv10_state_fb.c | |
| parent | 0ef3ce415522c77f11477c340efeef7b61cb8cb3 (diff) | |
nouveau: fix chipset checks for nv1a by using the oclass instead
Commit f4ebcd133b9 ("dri/nouveau: NV17_3D class is not available for
NV1a chipset") fixed this partially by using the correct 3d class.
However there were a lot of checks left over comparing against the
chipset.
Reported-and-tested-by: John F. Godfrey <[email protected]>
Signed-off-by: Ilia Mirkin <[email protected]>
Cc: 9.2 10.0 10.1 <[email protected]>
Reviewed-by: Francisco Jerez <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv10_state_fb.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_state_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c index 19769e5c47f..fb66b2d5494 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c +++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c @@ -106,7 +106,7 @@ nv10_emit_framebuffer(struct gl_context *ctx, int emit) /* At least nv11 seems to get sad if we don't do this before * swapping RTs.*/ - if (context_chipset(ctx) < 0x17) { + if (context_eng3d(ctx)->oclass < NV17_3D_CLASS) { int i; for (i = 0; i < 6; i++) { @@ -140,7 +140,7 @@ nv10_emit_framebuffer(struct gl_context *ctx, int emit) PUSH_MTHDl(push, NV10_3D(ZETA_OFFSET), BUFCTX_FB, s->bo, 0, bo_flags); - if (context_chipset(ctx) >= 0x17) { + if (context_eng3d(ctx)->oclass >= NV17_3D_CLASS) { setup_hierz_buffer(ctx); context_dirty(ctx, ZCLEAR); } |