aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/sk_app
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2018-05-11 10:14:21 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-11 14:47:27 +0000
commitc7fe0f708ccbf12bf2ad1374ff307940d2c93880 (patch)
treecc4e63c994ac6af6ddab2f0fa063dbf800e2dd8a /tools/sk_app
parent244f754cdd6ba1c5917a65cd94fe0bf87e3a7339 (diff)
Make GrCaps and GrShaderCaps private.
Moves getCaps() from GrContext to GrContextPriv and removes unused refCaps(). Change-Id: Ic6a8951b656c0d1b2773eae73bff8e88af819866 Reviewed-on: https://skia-review.googlesource.com/127389 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tools/sk_app')
-rw-r--r--tools/sk_app/GLWindowContext.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/tools/sk_app/GLWindowContext.cpp b/tools/sk_app/GLWindowContext.cpp
index 7dddede9aa..b6a8df9105 100644
--- a/tools/sk_app/GLWindowContext.cpp
+++ b/tools/sk_app/GLWindowContext.cpp
@@ -6,17 +6,17 @@
* found in the LICENSE file.
*/
+#include "GLWindowContext.h"
#include "GrBackendSurface.h"
+#include "GrCaps.h"
#include "GrContext.h"
-#include "GLWindowContext.h"
-
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLUtil.h"
-
+#include "GrContextPriv.h"
#include "SkCanvas.h"
#include "SkImage_Base.h"
#include "SkMathPriv.h"
#include "SkSurface.h"
+#include "gl/GrGLDefines.h"
+#include "gl/GrGLUtil.h"
namespace sk_app {
@@ -61,8 +61,10 @@ sk_sp<SkSurface> GLWindowContext::getBackbufferSurface() {
GR_GL_CALL(fBackendContext.get(), GetIntegerv(GR_GL_FRAMEBUFFER_BINDING,
&buffer));
fbInfo.fFBOID = buffer;
- fbInfo.fFormat = fContext->caps()->srgbSupport() && fDisplayParams.fColorSpace
- ? GR_GL_SRGB8_ALPHA8 : GR_GL_RGBA8;
+ fbInfo.fFormat =
+ fContext->contextPriv().caps()->srgbSupport() && fDisplayParams.fColorSpace
+ ? GR_GL_SRGB8_ALPHA8
+ : GR_GL_RGBA8;
GrBackendRenderTarget backendRT(fWidth,
fHeight,