commit 37df17d164bdb5a62fc6c2d2d9f1b59ee54587f7
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Dec 23 20:20:51 2010 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Dec 23 20:20:51 2010 +0000
tree 335981e9b580afab36d451ff4320f3005f85aeef
parent 51df9e3fe3c1aec370854b2718df16fc02faa1b2

fix build for linux
partial impl for GPU on linux (need getProcAddress and SkEGLContext)



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

gpu/include/GrGLConfig.h

diff --git a/gpu/include/GrGLConfig.h b/gpu/include/GrGLConfig.h
index 90763ab..7fab1b5 100644
--- a/gpu/include/GrGLConfig.h
+++ b/gpu/include/GrGLConfig.h
@@ -50,10 +50,12 @@
     #ifndef GL_GLEXT_PROTOTYPES
         #define GL_GLEXT_PROTOTYPES
     #endif
-    #define GR_INCLUDE_GLES1        <GLES/gl.h>
-    #define GR_INCLUDE_GLES1ext     <GLES/glext.h>
-    #define GR_INCLUDE_GLES2        <GLES2/gl2.h>
-    #define GR_INCLUDE_GLES2ext     <GLES2/gl2ext.h>
+    #define GR_INCLUDE_GLDESKTOP    <GL/gl.h>
+    #define GR_INCLUDE_GLDESKTOPext <GL/glext.h>
+//    #define GR_INCLUDE_GLES1        <GLES/gl.h>
+//    #define GR_INCLUDE_GLES1ext     <GLES/glext.h>
+//    #define GR_INCLUDE_GLES2        <GLES2/gl2.h>
+//    #define GR_INCLUDE_GLES2ext     <GLES2/gl2ext.h>
     #define GR_GL_FUNC
 #elif GR_QNX_BUILD
     #ifndef GL_GLEXT_PROTOTYPES

gpu/src/GrGpuGL.cpp

diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index 5198dbb..ebd0d03 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -1721,9 +1721,9 @@
     *address = eglGetProcAddress(procName);
     GrAssert(NULL != *address);
 #elif GR_LINUX_BUILD
-    GR_STATIC_ASSERT(!"Add environment-dependent implementation here");
+//    GR_STATIC_ASSERT(!"Add environment-dependent implementation here");
     //*address = glXGetProcAddressARB(procName);
-    //*address = eglGetProcAddress(procName);
+    *address = NULL;//eglGetProcAddress(procName);
 #elif GR_QNX_BUILD
     *address = eglGetProcAddress(procName);
     GrAssert(NULL != *address);