From b1854a85095f9924947bc00e665da47b0c0bdfb9 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 16 Jan 2014 18:39:04 +0000 Subject: Make GrGLContextInfo have private ptr to GrGLInterface BUG=skia:2042 R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/140843003 git-svn-id: http://skia.googlecode.com/svn/trunk@13111 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/gl/GrGpuGL.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/gpu/gl/GrGpuGL.h') diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h index 13243f3bd7..edd58c44bc 100644 --- a/src/gpu/gl/GrGpuGL.h +++ b/src/gpu/gl/GrGpuGL.h @@ -34,10 +34,11 @@ public: const GrGLContext& glContext() const { return fGLContext; } const GrGLInterface* glInterface() const { return fGLContext.interface(); } - const GrGLContextInfo& ctxInfo() const { return fGLContext.info(); } - GrGLStandard glStandard() const { return fGLContext.info().standard(); } - GrGLVersion glVersion() const { return fGLContext.info().version(); } - GrGLSLGeneration glslGeneration() const { return fGLContext.info().glslGeneration(); } + const GrGLContextInfo& ctxInfo() const { return fGLContext; } + GrGLStandard glStandard() const { return fGLContext.standard(); } + GrGLVersion glVersion() const { return fGLContext.version(); } + GrGLSLGeneration glslGeneration() const { return fGLContext.glslGeneration(); } + const GrGLCaps& glCaps() const { return *fGLContext.caps(); } // Used by GrGLProgram and GrGLTexGenProgramEffects to configure OpenGL state. void bindTexture(int unitIdx, const GrTextureParams& params, GrGLTexture* texture); @@ -77,8 +78,6 @@ public: virtual void abandonResources() SK_OVERRIDE; - const GrGLCaps& glCaps() const { return *fGLContext.info().caps(); } - // These functions should be used to bind GL objects. They track the GL state and skip redundant // bindings. Making the equivalent glBind calls directly will confuse the state tracking. void bindVertexArray(GrGLuint id) { @@ -177,7 +176,7 @@ private: // have been accounted for). void flushBlend(bool isLines, GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff); - bool hasExtension(const char* ext) const { return fGLContext.info().hasExtension(ext); } + bool hasExtension(const char* ext) const { return fGLContext.hasExtension(ext); } static bool BlendCoeffReferencesConstant(GrBlendCoeff coeff); -- cgit v1.2.3