diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-05 18:28:24 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-05 18:28:24 +0000 |
| commit | 9188a15f846ae79892c332aed2a72ee38116bdc6 (patch) | |
| tree | 2421f3b645f1cb8d0973587844e55cc35d5594c0 /src/gpu/gl/GrGpuGL.h | |
| parent | cf292b7b32732330f7e0a55e6dd323426e466f80 (diff) | |
Add a GrGpuGL reference for GrGLProgram/GrGLUniformManager
Updates GrGLProgram and GrGLUniformManager to keep a GrGpuGL reference
instead of one for GrGLContextInfo. No change in functionality, this
is in preparation to support fixed function GL calls for vertexless
shaders.
R=bsalomon@google.com
Author: cdalton@nvidia.com
Review URL: https://chromiumcodereview.appspot.com/23636011
git-svn-id: http://skia.googlecode.com/svn/trunk@11111 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.h')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h index 1d1cdc575e..669f21c9be 100644 --- a/src/gpu/gl/GrGpuGL.h +++ b/src/gpu/gl/GrGpuGL.h @@ -31,6 +31,7 @@ public: virtual ~GrGpuGL(); const GrGLInterface* glInterface() const { return fGLContext.interface(); } + const GrGLContextInfo& ctxInfo() const { return fGLContext.info(); } GrGLBinding glBinding() const { return fGLContext.info().binding(); } GrGLVersion glVersion() const { return fGLContext.info().version(); } GrGLSLGeneration glslGeneration() const { return fGLContext.info().glslGeneration(); } @@ -171,7 +172,7 @@ private: class ProgramCache : public ::GrNoncopyable { public: - ProgramCache(const GrGLContext& gl); + ProgramCache(GrGpuGL* gpu); ~ProgramCache(); void abandon(); @@ -203,7 +204,7 @@ private: int fCount; unsigned int fCurrLRUStamp; - const GrGLContext& fGL; + GrGpuGL* fGpu; #ifdef PROGRAM_CACHE_STATS int fTotalRequests; int fCacheMisses; |