commit 91bcc94e8710c1ec5126a31cd805a6c64bb3c39d
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 07 17:28:41 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 07 17:28:41 2012 +0000
tree 4f57f756b56b28a3451b5203ac4af654dcb79f98
parent 68288c289cc866c999d73681f5dd79f2bf524c15

Make GrGLDefines.h be a private header

Review URL: http://codereview.appspot.com/6198048/



git-svn-id: http://skia.googlecode.com/svn/trunk@3851 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/gpu.gyp

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 6f304d1..63dd6b2 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -201,7 +201,6 @@
 
         '../include/gpu/gl/GrGLConfig.h',
         '../include/gpu/gl/GrGLConfig_chrome.h',
-        '../include/gpu/gl/GrGLDefines.h',
         '../include/gpu/gl/GrGLInterface.h',
 
         '../src/gpu/GrAAHairLinePathRenderer.cpp',
@@ -284,6 +283,7 @@
         '../src/gpu/gl/GrGLCreateNullInterface.cpp',
         '../src/gpu/gl/GrGLDefaultInterface_none.cpp',
         '../src/gpu/gl/GrGLDefaultInterface_native.cpp',
+        '../src/gpu/gl/GrGLDefines.h',
         '../src/gpu/gl/GrGLIndexBuffer.cpp',
         '../src/gpu/gl/GrGLIndexBuffer.h',
         '../src/gpu/gl/GrGLInterface.cpp',

include/gpu/gl/GrGLConfig.h

diff --git a/include/gpu/gl/GrGLConfig.h b/include/gpu/gl/GrGLConfig.h
index 32fa6d0..bc85099 100644
--- a/include/gpu/gl/GrGLConfig.h
+++ b/include/gpu/gl/GrGLConfig.h
@@ -12,7 +12,6 @@
 #define GrGLConfig_DEFINED
 
 #include "GrTypes.h"
-#include "GrGLDefines.h"
 
 /**
  * Optional GL config file.

src/gpu/gl/GrGLCreateNullInterface.cpp

diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index 1a01d92..0a27a06 100644
--- a/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -9,6 +9,7 @@
 
 #include "gl/GrGLInterface.h"
 #include "../GrTDArray.h"
+#include "GrGLDefines.h"
 
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLActiveTexture(GrGLenum texture) {}
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLAttachShader(GrGLuint program, GrGLuint shader) {}

src/gpu/gl/GrGLDefines.h

diff --git a/include/gpu/gl/GrGLDefines.h b/src/gpu/gl/GrGLDefines.h
similarity index 100%
rename from include/gpu/gl/GrGLDefines.h
rename to src/gpu/gl/GrGLDefines.h

src/gpu/gl/GrGLUtil.h

diff --git a/src/gpu/gl/GrGLUtil.h b/src/gpu/gl/GrGLUtil.h
index 47e87ad..4b89301 100644
--- a/src/gpu/gl/GrGLUtil.h
+++ b/src/gpu/gl/GrGLUtil.h
@@ -9,6 +9,7 @@
 #define GrGLUtil_DEFINED
 
 #include "gl/GrGLInterface.h"
+#include "GrGLDefines.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 

src/gpu/gl/debug/GrBufferObj.h

diff --git a/src/gpu/gl/debug/GrBufferObj.h b/src/gpu/gl/debug/GrBufferObj.h
index c41cb1f..a78da83 100644
--- a/src/gpu/gl/debug/GrBufferObj.h
+++ b/src/gpu/gl/debug/GrBufferObj.h
@@ -10,6 +10,7 @@
 #define GrBufferObj_DEFINED
 
 #include "GrFakeRefObj.h"
+#include "../GrGLDefines.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 class GrBufferObj : public GrFakeRefObj {

src/gpu/gl/debug/GrShaderObj.h

diff --git a/src/gpu/gl/debug/GrShaderObj.h b/src/gpu/gl/debug/GrShaderObj.h
index 200c8b6..0e11237 100644
--- a/src/gpu/gl/debug/GrShaderObj.h
+++ b/src/gpu/gl/debug/GrShaderObj.h
@@ -10,6 +10,7 @@
 #define GrShaderObj_DEFINED
 
 #include "GrFakeRefObj.h"
+#include "../GrGLDefines.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 class GrShaderObj : public GrFakeRefObj {