summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/intel
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2012-05-09 15:51:11 -0700
committerPaul Berry <[email protected]>2012-05-25 08:45:11 -0700
commitab014adaed14a9ca213447dc913d0dce7906be56 (patch)
tree5b211c32fdbae20ac311d34ed9ba35bedeb931a8 /src/mesa/drivers/dri/intel
parent4725ba03cae87ddbf1fa10feaca3d42f24115f91 (diff)
i965/msaa: Enable 4x MSAA on Gen7.
Basic 4x MSAA support now works on Gen7. This patch enables it. As with Gen6, MSAA support is still fairly preliminary. In particular, the following are not yet supported: - 8x oversampling (Gen7 has hardware support for this, but we do not yet expose it). - Fully general blits between MSAA and non-MSAA buffers. - Formats other than RGBA8, DEPTH24, and STENCIL8. - Centrold interpolation. - Coverage parameters (glSampleCoverage, GL_SAMPLE_ALPHA_TO_COVERAGE, GL_SAMPLE_ALPHA_TO_ONE, GL_SAMPLE_COVERAGE, GL_SAMPLE_COVERAGE_VALUE, GL_SAMPLE_COVERAGE_INVERT). Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/intel')
-rw-r--r--src/mesa/drivers/dri/intel/intel_fbo.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index bbd5f6652e9..a801bb74c7e 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -202,7 +202,11 @@ quantize_num_samples(struct intel_context *intel, unsigned num_samples)
else
return 0;
case 7:
- /* TODO: MSAA only implemented on Gen6 */
+ /* TODO: Gen7 supports only 4x multisampling at the moment. */
+ if (num_samples > 0)
+ return 4;
+ else
+ return 0;
return 0;
default:
/* MSAA unsupported */