diff options
| author | Paul Berry <[email protected]> | 2012-07-17 21:06:01 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-07-24 14:52:59 -0700 |
| commit | 497bf5dd2b36c7d0c8ae23d2bf039c91b97140fc (patch) | |
| tree | 75ed5790dd652295d765fd1af840973f0b314ae7 | |
| parent | 728561271303baa6aaeb5bdd953e62b117feba4d (diff) | |
i965/msaa: Switch on 8x MSAA for Gen7.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_fbo.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 62b28be4ee0..faca7267190 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -154,8 +154,10 @@ brwCreateContext(int api, ctx->Const.MaxTransformFeedbackSeparateComponents = BRW_MAX_SOL_BINDINGS / BRW_MAX_SOL_BUFFERS; - if (intel->gen >= 6) + if (intel->gen == 6) ctx->Const.MaxSamples = 4; + else if (intel->gen >= 7) + ctx->Const.MaxSamples = 8; /* if conformance mode is set, swrast can handle any size AA point */ ctx->Const.MaxPointSizeAA = 255.0; diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index db4fb3b74a8..ac7d6c11665 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -193,8 +193,10 @@ quantize_num_samples(struct intel_context *intel, unsigned num_samples) else return 0; case 7: - /* TODO: Gen7 supports only 4x multisampling at the moment. */ - if (num_samples > 0) + /* Gen7 supports 4x and 8x multisampling. */ + if (num_samples > 4) + return 8; + else if (num_samples > 0) return 4; else return 0; |