Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: src/gpu/gl/GrGLContext.cpp

Issue 12843026: Make GrDrawTarget::Caps ref counted and GrGLCaps derive from it. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGLContext.h ('k') | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « src/gpu/gl/GrGLContext.h ('k') | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698