From c7fe0f708ccbf12bf2ad1374ff307940d2c93880 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 11 May 2018 10:14:21 -0400 Subject: 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 Reviewed-by: Greg Daniel --- tools/sk_app/GLWindowContext.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'tools/sk_app') 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 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, -- cgit v1.2.3