| Index: src/gpu/gl/GrGLContext.h
|
| ===================================================================
|
| --- src/gpu/gl/GrGLContext.h (revision 8359)
|
| +++ src/gpu/gl/GrGLContext.h (working copy)
|
| @@ -26,7 +26,10 @@
|
| /**
|
| * Default constructor
|
| */
|
| - GrGLContextInfo() { this->reset(); }
|
| + GrGLContextInfo() {
|
| + fGLCaps.reset(SkNEW(GrGLCaps));
|
| + this->reset();
|
| + }
|
|
|
| /**
|
| * Copies a GrGLContextInfo
|
| @@ -44,8 +47,8 @@
|
| GrGLVersion version() const { return fGLVersion; }
|
| GrGLSLGeneration glslGeneration() const { return fGLSLGeneration; }
|
| GrGLVendor vendor() const { return fVendor; }
|
| - const GrGLCaps& caps() const { return fGLCaps; }
|
| - GrGLCaps& caps() { return fGLCaps; }
|
| + const GrGLCaps* caps() const { return fGLCaps.get(); }
|
| + GrGLCaps* caps() { return fGLCaps; }
|
|
|
| /**
|
| * Checks for extension support using a cached copy of the GL_EXTENSIONS
|
| @@ -65,12 +68,12 @@
|
|
|
| private:
|
|
|
| - GrGLBinding fBindingInUse;
|
| - GrGLVersion fGLVersion;
|
| - GrGLSLGeneration fGLSLGeneration;
|
| - GrGLVendor fVendor;
|
| - GrGLExtensions fExtensions;
|
| - GrGLCaps fGLCaps;
|
| + GrGLBinding fBindingInUse;
|
| + GrGLVersion fGLVersion;
|
| + GrGLSLGeneration fGLSLGeneration;
|
| + GrGLVendor fVendor;
|
| + GrGLExtensions fExtensions;
|
| + SkAutoTUnref<GrGLCaps> fGLCaps;
|
| };
|
|
|
| /**
|
|
|