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

Unified Diff: src/gpu/gl/GrGLCaps.h

Issue 1177053002: Init GrGLSLCaps fields from inside GrGLCaps (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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 | « include/gpu/GrCaps.h ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLCaps.h
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 742a74d360cbac28a99db268723ad926997fde3b..e924c60efb945796be098d138ec8fcede51b897c 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -264,7 +264,7 @@ public:
GrGLSLCaps* glslCaps() const { return reinterpret_cast<GrGLSLCaps*>(fShaderCaps.get()); }
private:
- void init(const GrGLContextInfo& ctxInfo, const GrGLInterface* glInterface);
+ void init(const GrContextOptions&, const GrGLContextInfo&, const GrGLInterface*);
/**
* Maintains a bit per GrPixelConfig. It is used to avoid redundantly
@@ -428,8 +428,6 @@ public:
SkString dump() const override;
private:
- void init(const GrGLContextInfo&, const GrGLInterface*, const GrGLCaps&);
-
// Must be called after fGeometryShaderSupport is initialized.
void initShaderPrecisionTable(const GrGLContextInfo&, const GrGLInterface*);
@@ -444,6 +442,8 @@ private:
AdvBlendEqInteraction fAdvBlendEqInteraction;
+ friend class GrGLCaps; // For initialization.
+
typedef GrShaderCaps INHERITED;
};
« no previous file with comments | « include/gpu/GrCaps.h ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698