diff options
| author |  bsalomon <bsalomon@google.com> | 2015-02-11 12:07:31 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-11 12:07:31 -0800 |
| commit | 7e34007e1efe6b4e9b40109998a9c0b5b0ee9791 (patch) | |
| tree | 4b5be791ccc1fdbf4a1912f19772c8ce23f39e81 /src/gpu/gl | |
| parent | f5e89c8f685ac8a5c4d117e087b4111d613106db (diff) | |
Add GrGLCreateNullInterface.cpp back to gyp, and put contents in namespace.
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/899803004
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLCreateNullInterface.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp index 14919bb786..c86a0bd2fd 100644 --- a/src/gpu/gl/GrGLCreateNullInterface.cpp +++ b/src/gpu/gl/GrGLCreateNullInterface.cpp @@ -12,6 +12,12 @@ #include "GrGLNoOpInterface.h" #include "SkTLS.h" +// TODO: Delete this file after chrome starts using SkNullGLContext. + +// added to suppress 'no previous prototype' warning and because this code is duplicated in +// SkNullGLContext.cpp +namespace { + class BufferObj { public: SK_DECLARE_INST_COUNT(BufferObj); @@ -141,8 +147,6 @@ private: // Functions not declared in GrGLBogusInterface.h (not common with the Debug GL interface). -namespace { // added to suppress 'no previous prototype' warning - GrGLvoid GR_GL_FUNCTION_TYPE nullGLActiveTexture(GrGLenum texture) {} GrGLvoid GR_GL_FUNCTION_TYPE nullGLAttachShader(GrGLuint program, GrGLuint shader) {} GrGLvoid GR_GL_FUNCTION_TYPE nullGLBeginQuery(GrGLenum target, GrGLuint id) {} |