Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(495)

Unified Diff: src/gpu/GrContext.cpp

Issue 1592803002: Differentiate maxColorSamples and maxStencilSamples in GrCaps (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrCaps.cpp ('k') | src/gpu/GrGpu.cpp » ('j') | src/gpu/gl/GrGLGpu.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrContext.cpp
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index e92014415c24fc573bbfa59cc7eada3dd444e82a..5fad2d58c46328d3b0e83ec82f6b57075fde372a 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -572,8 +572,9 @@ int GrContext::getRecommendedSampleCount(GrPixelConfig config,
chosenSampleCount = 16;
}
}
- return chosenSampleCount <= fGpu->caps()->maxSampleCount() ?
- chosenSampleCount : 0;
+ bool validSampleCount = chosenSampleCount <= fGpu->caps()->maxColorSampleCount() &&
bsalomon 2016/01/15 18:08:29 Might need a check for mixed samples support here.
+ chosenSampleCount <= fGpu->caps()->maxStencilSampleCount();
+ return validSampleCount ? chosenSampleCount : 0;
}
« no previous file with comments | « src/gpu/GrCaps.cpp ('k') | src/gpu/GrGpu.cpp » ('j') | src/gpu/gl/GrGLGpu.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698