From 78ff6b4ab677e156b016054ece6a4d08d5846cb7 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 28 Mar 2012 19:37:51 +0000 Subject: [PATCH] Moved mac, unix, win and mesa directories under src/gpu/gl http://codereview.appspot.com/5937052/ git-svn-id: http://skia.googlecode.com/svn/trunk@3530 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/gpu.gyp | 30 +++++++++---------- .../mac/GrGLCreateNativeInterface_mac.cpp | 0 .../{ => gl}/mac/SkNativeGLContext_mac.cpp | 0 .../{ => gl}/mesa/GrGLCreateMesaInterface.cpp | 0 src/gpu/{ => gl}/mesa/SkMesaGLContext.cpp | 0 .../unix/GrGLCreateNativeInterface_unix.cpp | 0 .../{ => gl}/unix/SkNativeGLContext_unix.cpp | 0 .../win/GrGLCreateNativeInterface_win.cpp | 0 .../{ => gl}/win/SkNativeGLContext_win.cpp | 0 9 files changed, 15 insertions(+), 15 deletions(-) rename src/gpu/{ => gl}/mac/GrGLCreateNativeInterface_mac.cpp (100%) rename src/gpu/{ => gl}/mac/SkNativeGLContext_mac.cpp (100%) rename src/gpu/{ => gl}/mesa/GrGLCreateMesaInterface.cpp (100%) rename src/gpu/{ => gl}/mesa/SkMesaGLContext.cpp (100%) rename src/gpu/{ => gl}/unix/GrGLCreateNativeInterface_unix.cpp (100%) rename src/gpu/{ => gl}/unix/SkNativeGLContext_unix.cpp (100%) rename src/gpu/{ => gl}/win/GrGLCreateNativeInterface_win.cpp (100%) rename src/gpu/{ => gl}/win/SkNativeGLContext_win.cpp (100%) diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index 416d0e380d..fb5dff331b 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -115,20 +115,20 @@ '../src/gpu/gl/debug/SkDebugGLContext.cpp', + '../src/gpu/gl/mac/SkNativeGLContext_mac.cpp', + + '../src/gpu/gl/win/SkNativeGLContext_win.cpp', + + '../src/gpu/gl/unix/SkNativeGLContext_unix.cpp', + + '../src/gpu/gl/mesa/SkMesaGLContext.cpp', + '../src/gpu/android/SkNativeGLContext_android.cpp', - - '../src/gpu/mac/SkNativeGLContext_mac.cpp', - - '../src/gpu/win/SkNativeGLContext_win.cpp', - - '../src/gpu/unix/SkNativeGLContext_unix.cpp', - - '../src/gpu/mesa/SkMesaGLContext.cpp', ], 'conditions': [ [ 'not skia_mesa', { 'sources!': [ - '../src/gpu/mesa/SkMesaGLContext.cpp', + '../src/gpu/gl/mesa/SkMesaGLContext.cpp', ], }], [ 'skia_mesa and skia_os == "mac"', { @@ -281,15 +281,15 @@ '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', - '../src/gpu/mac/GrGLCreateNativeInterface_mac.cpp', + '../src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp', - '../src/gpu/win/GrGLCreateNativeInterface_win.cpp', + '../src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', - '../src/gpu/unix/GrGLCreateNativeInterface_unix.cpp', + '../src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp', + + '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', '../src/gpu/android/GrGLCreateNativeInterface_android.cpp', - - '../src/gpu/mesa/GrGLCreateMesaInterface.cpp', ], 'defines': [ 'GR_IMPLEMENTATION=1', @@ -337,7 +337,7 @@ }], [ 'not skia_mesa', { 'sources!': [ - '../src/gpu/mesa/GrGLCreateMesaInterface.cpp', + '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', ], }], [ 'skia_os == "win"', { diff --git a/src/gpu/mac/GrGLCreateNativeInterface_mac.cpp b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp similarity index 100% rename from src/gpu/mac/GrGLCreateNativeInterface_mac.cpp rename to src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp diff --git a/src/gpu/mac/SkNativeGLContext_mac.cpp b/src/gpu/gl/mac/SkNativeGLContext_mac.cpp similarity index 100% rename from src/gpu/mac/SkNativeGLContext_mac.cpp rename to src/gpu/gl/mac/SkNativeGLContext_mac.cpp diff --git a/src/gpu/mesa/GrGLCreateMesaInterface.cpp b/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp similarity index 100% rename from src/gpu/mesa/GrGLCreateMesaInterface.cpp rename to src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp diff --git a/src/gpu/mesa/SkMesaGLContext.cpp b/src/gpu/gl/mesa/SkMesaGLContext.cpp similarity index 100% rename from src/gpu/mesa/SkMesaGLContext.cpp rename to src/gpu/gl/mesa/SkMesaGLContext.cpp diff --git a/src/gpu/unix/GrGLCreateNativeInterface_unix.cpp b/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp similarity index 100% rename from src/gpu/unix/GrGLCreateNativeInterface_unix.cpp rename to src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp diff --git a/src/gpu/unix/SkNativeGLContext_unix.cpp b/src/gpu/gl/unix/SkNativeGLContext_unix.cpp similarity index 100% rename from src/gpu/unix/SkNativeGLContext_unix.cpp rename to src/gpu/gl/unix/SkNativeGLContext_unix.cpp diff --git a/src/gpu/win/GrGLCreateNativeInterface_win.cpp b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp similarity index 100% rename from src/gpu/win/GrGLCreateNativeInterface_win.cpp rename to src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp diff --git a/src/gpu/win/SkNativeGLContext_win.cpp b/src/gpu/gl/win/SkNativeGLContext_win.cpp similarity index 100% rename from src/gpu/win/SkNativeGLContext_win.cpp rename to src/gpu/gl/win/SkNativeGLContext_win.cpp