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

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

Issue 899803004: Add GrGLCreateNullInterface.cpp back to gyp, and put contents in namespace. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 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 | « gyp/gpu.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLCreateNullInterface.cpp
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index 14919bb786069d9ab3d0a36df0d23cfe8085a991..c86a0bd2fd87548f78b371f978525cf5f0fbf417 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
bsalomon 2015/02/11 20:01:27 Not entirely sure this is necessary but seemed saf
+// 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) {}
« no previous file with comments | « gyp/gpu.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698