From 0edea2c8e76a9f5340a7a4960193757c4a5fb227 Mon Sep 17 00:00:00 2001 From: cdalton Date: Thu, 21 May 2015 08:27:44 -0700 Subject: Make mixed samples contingent on auxiliary extensions Moves the cap for mixed samples into GrShaderCaps and does not enable it unless we have support for both dual source blending and multisample disable. Creates a dedicated cap for multisample disable. Reconfigures the mixed samples cap to indicate the collective capability of three different extensions: GL_NV_framebuffer_mixed_samples GL_NV_sample_mask_override_coverage GL_EXT_raster_multisample Imports tokens and procedures for GL_EXT_raster_multisample. BUG=skia: Review URL: https://codereview.chromium.org/1151793002 --- src/gpu/gl/GrGLInterface.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/gpu/gl/GrGLInterface.cpp') diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index 89f1f9ba65..8bbd2f3b1b 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -528,6 +528,12 @@ bool GrGLInterface::validate() const { } } + if (fExtensions.has("GL_EXT_raster_multisample")) { + if (NULL == fFunctions.fRasterSamples) { + RETURN_FALSE_INTERFACE + } + } + if (fExtensions.has("GL_NV_framebuffer_mixed_samples")) { if (NULL == fFunctions.fCoverageModulation) { RETURN_FALSE_INTERFACE -- cgit v1.2.3