diff options
author | 2011-08-19 13:28:54 +0000 | |
---|---|---|
committer | 2011-08-19 13:28:54 +0000 | |
commit | 0b77d6892b067ad402c9678b0226bff70599fbe2 (patch) | |
tree | c3659ba65d516bedf2d3a021f2b9f4be94d3f04b /gpu/src/GrGLIRect.h | |
parent | 098660020cf06ef9a95934b9635ab6996145b3e2 (diff) |
Make GrGLInterface a per-GrContext refcounted object rather than a global
Review URL: http://codereview.appspot.com/4901046/
git-svn-id: http://skia.googlecode.com/svn/trunk@2140 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrGLIRect.h')
-rw-r--r-- | gpu/src/GrGLIRect.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gpu/src/GrGLIRect.h b/gpu/src/GrGLIRect.h index 5e3dfa6d53..e94fa21a5a 100644 --- a/gpu/src/GrGLIRect.h +++ b/gpu/src/GrGLIRect.h @@ -23,17 +23,17 @@ struct GrGLIRect { GrGLsizei fWidth; GrGLsizei fHeight; - void pushToGLViewport() const { - GR_GL(Viewport(fLeft, fBottom, fWidth, fHeight)); + void pushToGLViewport(const GrGLInterface* gl) const { + GR_GL_CALL(gl, Viewport(fLeft, fBottom, fWidth, fHeight)); } - void pushToGLScissor() const { - GR_GL(Scissor(fLeft, fBottom, fWidth, fHeight)); + void pushToGLScissor(const GrGLInterface* gl) const { + GR_GL_CALL(gl, Scissor(fLeft, fBottom, fWidth, fHeight)); } - void setFromGLViewport() { + void setFromGLViewport(const GrGLInterface* gl) { GR_STATIC_ASSERT(sizeof(GrGLIRect) == 4*sizeof(GrGLint)); - GR_GL_GetIntegerv(GR_GL_VIEWPORT, (GrGLint*) this); + GR_GL_GetIntegerv(gl, GR_GL_VIEWPORT, (GrGLint*) this); } // sometimes we have a GrIRect from the client that we |