move utils/SkEGLContext to gpu/SkGLContext, some gpu.gyp cleanup, set eol style LF on all gpu files

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



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

2 files changed, 95 insertions, 107 deletions

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 83aa525439..690258a1a9 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -2,6 +2,89 @@
   'includes': [
     'common.gypi',
   ],
+  'target_defaults': {
+    'conditions': [
+      ['skia_os != "win"', {
+        'sources/': [ ['exclude', '_win.(h|cpp)$'],
+        ],
+      }],
+      ['skia_os != "mac"', {
+        'sources/': [ ['exclude', '_mac.(h|cpp)$'],
+        ],
+      }],
+      ['skia_os != "linux"', {
+        'sources/': [ ['exclude', '_unix.(h|cpp)$'],
+        ],
+      }],
+      ['skia_os != "ios"', {
+        'sources/': [ ['exclude', '_iOS.(h|cpp)$'],
+        ],
+      }],
+      ['skia_os != "android"', {
+        'sources/': [ ['exclude', '_android.(h|cpp)$'],
+        ],
+      }],
+      [ 'skia_os == "android"', {
+        'defines': [
+          'GR_ANDROID_BUILD=1',
+        ],
+      }],
+      [ 'skia_os == "mac"', {
+        'defines': [
+          'GR_MAC_BUILD=1',
+        ],
+      }],
+      [ 'skia_os == "linux"', {
+        'defines': [
+          'GR_LINUX_BUILD=1',
+        ],
+      }],
+      [ 'skia_os == "ios"', {
+        'defines': [
+          'GR_IOS_BUILD=1',
+        ],
+      }],
+      [ 'skia_os == "win"', {
+        'defines': [
+          'GR_WIN32_BUILD=1',
+          'GR_GL_FUNCTION_TYPE=__stdcall',
+        ],
+      }],
+    ],
+    'direct_dependent_settings': {
+      'conditions': [
+        [ 'skia_os == "android"', {
+          'defines': [
+            'GR_ANDROID_BUILD=1',
+          ],
+        }],
+        [ 'skia_os == "mac"', {
+          'defines': [
+            'GR_MAC_BUILD=1',
+          ],
+        }],
+        [ 'skia_os == "linux"', {
+          'defines': [
+            'GR_LINUX_BUILD=1',
+          ],
+        }],
+        [ 'skia_os == "ios"', {
+          'defines': [
+            'GR_IOS_BUILD=1',
+          ],
+        }],
+        [ 'skia_os == "win"', {
+          'defines': [
+            'GR_WIN32_BUILD=1',
+            'GR_GL_FUNCTION_TYPE=__stdcall',
+          ],
+        }],
+      ],
+      'include_dirs': [
+        '../include/gpu',
+      ],
+    },
+  },
   'targets': [
     {
       'target_name': 'skgr',
@@ -24,46 +107,19 @@
         '../src/gpu/SkGr.cpp',
         '../src/gpu/SkGrFontScaler.cpp',
         '../src/gpu/SkGrTexturePixelRef.cpp',
+
+        '../src/gpu/mac/SkGLContext_mac.cpp',
+
+        '../src/gpu/win/SkGLContext_win.cpp',
+
+        '../src/gpu/unix/SkGLContext_unix.cpp',
+
+        '../src/gpu/mesa/SkGLContext_mesa.cpp',
       ],
-      'conditions': [
-          [ 'skia_os == "linux"', {
-          'defines': [
-              'GR_LINUX_BUILD=1',
-          ],
-          }],
-          [ 'skia_os == "mac"', {
-          'defines': [
-              'GR_MAC_BUILD=1',
-          ],
-          }],
-          [ 'skia_os == "win"', {
-          'defines': [
-              'GR_WIN32_BUILD=1',
-          ],
-          }],
+      # Removed for now
+      'sources!': [
+        '../src/gpu/mesa/SkGLContext_mesa.cpp',
       ],
-      'direct_dependent_settings': {
-        'conditions': [
-          [ 'skia_os == "linux"', {
-            'defines': [
-              'GR_LINUX_BUILD=1',
-            ],
-          }],
-          [ 'skia_os == "mac"', {
-            'defines': [
-              'GR_MAC_BUILD=1',
-            ],
-          }],
-          [ 'skia_os == "win"', {
-            'defines': [
-              'GR_WIN32_BUILD=1',
-            ],
-          }],
-        ],
-        'include_dirs': [
-          '../include/gpu',
-        ],
-      },
     },
     {
       'target_name': 'gr',
@@ -201,6 +257,7 @@
 
         '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp',
       ],
+      # Removed for now
       'sources!': [
         '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp',
       ],
@@ -209,9 +266,6 @@
       ],
       'conditions': [
         [ 'skia_os == "linux"', {
-          'defines': [
-              'GR_LINUX_BUILD=1',
-          ],
           'sources!': [
             '../src/gpu/GrGLDefaultInterface_none.cpp',
           ],
@@ -223,9 +277,6 @@
           },
         }],
         [ 'skia_os == "mac"', {
-          'defines': [
-              'GR_MAC_BUILD=1',
-          ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
@@ -236,53 +287,11 @@
           ],
           }],
         [ 'skia_os == "win"', {
-          'defines': [
-            'GR_WIN32_BUILD=1',
-            'GR_GL_FUNCTION_TYPE=__stdcall',
-          ],
           'sources!': [
             '../src/gpu/GrGLDefaultInterface_none.cpp',
           ],
         }],
-        [ 'skia_os != "win"', {
-          'sources!': [
-            '../src/gpu/win/GrGLDefaultInterface_win.cpp',
-          ],
-        }],
-        [ 'skia_os != "mac"', {
-          'sources!': [
-            '../src/gpu/mac/GrGLDefaultInterface_mac.cpp',
-          ],
-        }],
-        [ 'skia_os != "linux"', {
-          'sources!': [
-            '../src/gpu/unix/GrGLDefaultInterface_unix.cpp',
-          ],
-        }],
       ],
-      'direct_dependent_settings': {
-        'conditions': [
-          [ 'skia_os == "linux"', {
-            'defines': [
-              'GR_LINUX_BUILD=1',
-            ],
-          }],
-          [ 'skia_os == "mac"', {
-            'defines': [
-              'GR_MAC_BUILD=1',
-            ],
-          }],
-          [ 'skia_os == "win"', {
-            'defines': [
-              'GR_WIN32_BUILD=1',
-              'GR_GL_FUNCTION_TYPE=__stdcall',
-            ],
-          }],
-        ],
-        'include_dirs': [
-          '../include/gpu',
-        ],
-      },
     },
   ],
 }
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 73a80eb065..067671eea4 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -23,7 +23,6 @@
         '../include/utils/SkCubicInterval.h',
         '../include/utils/SkCullPoints.h',
         '../include/utils/SkDumpCanvas.h',
-        '../include/utils/SkEGLContext.h',
         '../include/utils/SkGLCanvas.h',
         '../include/utils/SkInterpolator.h',
         '../include/utils/SkLayer.h',
@@ -45,7 +44,6 @@
         '../src/utils/SkCubicInterval.cpp',
         '../src/utils/SkCullPoints.cpp',
         '../src/utils/SkDumpCanvas.cpp',
-        '../src/utils/SkEGLContext_none.cpp',
         '../src/utils/SkInterpolator.cpp',
         '../src/utils/SkLayer.cpp',
         '../src/utils/SkMatrix44.cpp',
@@ -63,17 +61,12 @@
         #mac
         '../include/utils/mac/SkCGUtils.h',
         '../src/utils/mac/SkCreateCGImageRef.cpp',
-        '../src/utils/mac/SkEGLContext_mac.cpp',
-
-        #mesa
-        '../src/utils/mesa/SkEGLContext_Mesa.cpp',
 
         #sdl
         '../src/utils/SDL/SkOSWindow_SDL.cpp',
 
         #*nix
         '../src/utils/unix/keysym2ucs.c',
-        '../src/utils/unix/SkEGLContext_Unix.cpp',
         '../src/utils/unix/SkOSWindow_Unix.cpp',
         
         #windows
@@ -83,20 +76,15 @@
         '../include/utils/win/SkTScopedComPtr.h',
         '../src/utils/win/SkAutoCoInitialize.cpp',
         '../src/utils/win/skia_win.cpp',
-        '../src/utils/win/SkEGLContext_Win.cpp',
         '../src/utils/win/SkHRESULT.cpp',
         '../src/utils/win/SkIStream.cpp',
         '../src/utils/win/SkOSWindow_Win.cpp',
       ],
       'sources!': [
-          '../src/utils/mesa/SkEGLContext_Mesa.cpp',
           '../src/utils/SDL/SkOSWindow_SDL.cpp',
       ],
       'conditions': [
         [ 'skia_os == "mac"', {
-          'sources!': [
-            '../src/utils/SkEGLContext_none.cpp',
-          ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AGL.framework',
@@ -114,15 +102,11 @@
           'sources!': [
             '../include/utils/mac/SkCGUtils.h',
             '../src/utils/mac/SkCreateCGImageRef.cpp',
-            '../src/utils/mac/SkEGLContext_mac.cpp',
             '../src/utils/mac/skia_mac.mm',
             '../src/utils/mac/SkOSWindow_Mac.mm',
           ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
-          'sources!': [
-            '../src/utils/SkEGLContext_none.cpp',
-          ],
           'link_settings': {
             'libraries': [
               '-lGL',
@@ -135,14 +119,10 @@
           ],
           'sources!': [
             '../src/utils/unix/keysym2ucs.c',
-            '../src/utils/unix/SkEGLContext_Unix.cpp',
             '../src/utils/unix/SkOSWindow_Unix.cpp',
           ],
         }],
         [ 'skia_os == "win"', {
-          'sources!': [
-            '../src/utils/SkEGLContext_none.cpp',
-          ],
           'direct_dependent_settings': {
             'include_dirs': [
               '../include/utils/win',
@@ -159,7 +139,6 @@
             '../include/utils/win/SkTScopedComPtr.h',
             '../src/utils/win/SkAutoCoInitialize.cpp',
             '../src/utils/win/skia_win.cpp',
-            '../src/utils/win/SkEGLContext_Win.cpp',
             '../src/utils/win/SkHRESULT.cpp',
             '../src/utils/win/SkIStream.cpp',
             '../src/utils/win/SkOSWindow_Win.cpp',