diff options
| author | vbuzinov <vbuzinov@nvidia.com> | 2015-06-12 08:59:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-12 08:59:45 -0700 |
| commit | dded69693dd3779f081326cde24c3954505b129d (patch) | |
| tree | 0cfc3a16d31093185082268ab16599edb7c0464f /tests/GLProgramsTest.cpp | |
| parent | 57856a1f589bea64ed84535efed0668221060f9b (diff) | |
Implement support for mixed sampled render targets
Adds a new FBO type kStencil_MSFBOType that is selected whenever
NV_framebuffer_mixed_samples extension is available. In this new
FBO type a non-msaa color buffer is created with a multisampled
stencil buffer attachment.
Replaces numSamples() with separate numColorSamples and numStencilSamples
methods in RenderTarget.
In mixed samples mode non-MSAA codepaths are used to draw simple shapes,
while NVPR-rendered paths and text are rendered with a multisampled
stencil.
BUG=skia:3177
Review URL: https://codereview.chromium.org/1001503002
Diffstat (limited to 'tests/GLProgramsTest.cpp')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index d329124a07..1bf10ba553 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -179,7 +179,7 @@ static void set_random_state(GrPipelineBuilder* pipelineBuilder, SkRandom* rando // If we don't have an MSAA rendertarget then we have to disable useHWAA if ((state | GrPipelineBuilder::kHWAntialias_Flag) && - !pipelineBuilder->getRenderTarget()->isMultisampled()) { + !pipelineBuilder->getRenderTarget()->isUnifiedMultisampled()) { state &= ~GrPipelineBuilder::kHWAntialias_Flag; } pipelineBuilder->enableState(state); |
