Index: src/gpu/gl/GrGLContext.cpp |
=================================================================== |
--- src/gpu/gl/GrGLContext.cpp (revision 8359) |
+++ src/gpu/gl/GrGLContext.cpp (working copy) |
@@ -14,7 +14,7 @@ |
fGLSLGeneration = ctxInfo.fGLSLGeneration; |
fVendor = ctxInfo.fVendor; |
fExtensions = ctxInfo.fExtensions; |
robertphillips
2013/03/25 15:34:09
Shouldn't there be a ref here?
bsalomon
2013/03/25 15:37:27
It's object assignment not pointer assignment. Sin
robertphillips
2013/03/25 22:41:28
Okay - missed that when reading through. Does that
|
- fGLCaps = ctxInfo.fGLCaps; |
+ *fGLCaps = *ctxInfo.fGLCaps.get(); |
return *this; |
} |
@@ -36,7 +36,7 @@ |
fGLSLGeneration = GrGetGLSLGeneration(fBindingInUse, interface); |
fVendor = GrGLGetVendor(interface); |
- fGLCaps.init(*this, interface); |
+ fGLCaps->init(*this, interface); |
return true; |
} |
} |
@@ -53,7 +53,7 @@ |
fGLSLGeneration = static_cast<GrGLSLGeneration>(0); |
fVendor = kOther_GrGLVendor; |
fExtensions.reset(); |
- fGLCaps.reset(); |
+ fGLCaps->reset(); |
} |
//////////////////////////////////////////////////////////////////////////////// |