diff options
| -rw-r--r-- | gyp/gpu.gyp | 95 | ||||
| -rw-r--r-- | tests/GLProgramsTest.cpp | 2 |
2 files changed, 50 insertions, 47 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index f85e8199f0..275a792c28 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -101,23 +101,25 @@ '../include/gpu', ], 'sources': [ - '../include/gpu/SkGLContext.h', - '../include/gpu/SkMesaGLContext.h', - '../include/gpu/SkNativeGLContext.h', - '../include/gpu/SkNullGLContext.h', '../include/gpu/SkGpuCanvas.h', '../include/gpu/SkGpuDevice.h', '../include/gpu/SkGr.h', '../include/gpu/SkGrTexturePixelRef.h', + '../include/gpu/SkGLContext.h', + '../include/gpu/SkMesaGLContext.h', + '../include/gpu/SkNativeGLContext.h', + '../include/gpu/SkNullGLContext.h', + '../src/gpu/GrPrintf_skia.cpp', - '../src/gpu/SkGLContext.cpp', '../src/gpu/SkGpuCanvas.cpp', '../src/gpu/SkGpuDevice.cpp', '../src/gpu/SkGr.cpp', '../src/gpu/SkGrFontScaler.cpp', '../src/gpu/SkGrTexturePixelRef.cpp', - '../src/gpu/SkNullGLContext.cpp', + + '../src/gpu/gl/SkGLContext.cpp', + '../src/gpu/gl/SkNullGLContext.cpp', '../src/gpu/android/SkNativeGLContext_android.cpp', @@ -161,10 +163,6 @@ '../include/gpu/GrConfig.h', '../include/gpu/GrContext.h', '../include/gpu/GrFontScaler.h', - '../include/gpu/GrGLConfig.h', - '../include/gpu/GrGLConfig_chrome.h', - '../include/gpu/GrGLDefines.h', - '../include/gpu/GrGLInterface.h', '../include/gpu/GrGlyph.h', '../include/gpu/GrInstanceCounter.h', '../include/gpu/GrKey.h', @@ -184,6 +182,11 @@ '../include/gpu/GrTypes.h', '../include/gpu/GrUserConfig.h', + '../include/gpu/GrGLConfig.h', + '../include/gpu/GrGLConfig_chrome.h', + '../include/gpu/GrGLDefines.h', + '../include/gpu/GrGLInterface.h', + '../src/gpu/GrAAHairLinePathRenderer.cpp', '../src/gpu/GrAAHairLinePathRenderer.h', '../src/gpu/GrAAConvexPathRenderer.cpp', @@ -205,37 +208,9 @@ '../src/gpu/GrDrawTarget.cpp', '../src/gpu/GrDrawTarget.h', '../src/gpu/GrGeometryBuffer.h', - '../src/gpu/GrGLContextInfo.cpp', - '../src/gpu/GrGLContextInfo.h', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', - '../src/gpu/GrGLCreateNullInterface.cpp', - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLDefaultInterface_native.cpp', - '../src/gpu/GrGLIndexBuffer.cpp', - '../src/gpu/GrGLIndexBuffer.h', - '../src/gpu/GrGLInterface.cpp', - '../src/gpu/GrGLIRect.h', - '../src/gpu/GrGLProgram.cpp', - '../src/gpu/GrGLProgram.h', - '../src/gpu/GrGLRenderTarget.cpp', - '../src/gpu/GrGLRenderTarget.h', - '../src/gpu/GrGLShaderVar.h', - '../src/gpu/GrGLSL.cpp', - '../src/gpu/GrGLSL.h', - '../src/gpu/GrGLStencilBuffer.cpp', - '../src/gpu/GrGLStencilBuffer.h', - '../src/gpu/GrGLTexture.cpp', - '../src/gpu/GrGLTexture.h', - '../src/gpu/GrGLUtil.cpp', - '../src/gpu/GrGLVertexBuffer.cpp', - '../src/gpu/GrGLVertexBuffer.h', '../src/gpu/GrGpu.cpp', '../src/gpu/GrGpu.h', '../src/gpu/GrGpuFactory.cpp', - '../src/gpu/GrGpuGL.cpp', - '../src/gpu/GrGpuGL.h', - '../src/gpu/GrGpuGLShaders.cpp', - '../src/gpu/GrGpuGLShaders.h', '../src/gpu/GrGpuVertex.h', '../src/gpu/GrIndexBuffer.h', '../src/gpu/GrInOrderDrawBuffer.cpp', @@ -276,6 +251,34 @@ '../src/gpu/GrVertexBuffer.h', '../src/gpu/gr_unittests.cpp', + '../src/gpu/gl/GrGLContextInfo.cpp', + '../src/gpu/gl/GrGLContextInfo.h', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNullInterface.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_native.cpp', + '../src/gpu/gl/GrGLIndexBuffer.cpp', + '../src/gpu/gl/GrGLIndexBuffer.h', + '../src/gpu/gl/GrGLInterface.cpp', + '../src/gpu/gl/GrGLIRect.h', + '../src/gpu/gl/GrGLProgram.cpp', + '../src/gpu/gl/GrGLProgram.h', + '../src/gpu/gl/GrGLRenderTarget.cpp', + '../src/gpu/gl/GrGLRenderTarget.h', + '../src/gpu/gl/GrGLShaderVar.h', + '../src/gpu/gl/GrGLSL.cpp', + '../src/gpu/gl/GrGLSL.h', + '../src/gpu/gl/GrGLStencilBuffer.cpp', + '../src/gpu/gl/GrGLStencilBuffer.h', + '../src/gpu/gl/GrGLTexture.cpp', + '../src/gpu/gl/GrGLTexture.h', + '../src/gpu/gl/GrGLUtil.cpp', + '../src/gpu/gl/GrGLVertexBuffer.cpp', + '../src/gpu/gl/GrGLVertexBuffer.h', + '../src/gpu/gl/GrGpuGL.cpp', + '../src/gpu/gl/GrGpuGL.h', + '../src/gpu/gl/GrGpuGLShaders.cpp', + '../src/gpu/gl/GrGpuGLShaders.h', '../src/gpu/mac/GrGLCreateNativeInterface_mac.cpp', @@ -298,8 +301,8 @@ }], [ 'skia_os == "linux"', { 'sources!': [ - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], 'link_settings': { 'libraries': [ @@ -322,8 +325,8 @@ ], }, 'sources!': [ - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], }], [ 'skia_mesa and skia_os == "mac"', { @@ -343,14 +346,14 @@ }], [ 'skia_os == "win"', { 'sources!': [ - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], }], [ 'skia_os == "android"', { 'sources!': [ - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], 'link_settings': { 'libraries': [ diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 5cacadefe3..583b80233c 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -8,7 +8,7 @@ #include "Test.h" #include "GrContext.h" -#include "GrGpuGLShaders.h" +#include "gl/GrGpuGLShaders.h" static void GLProgramsTest(skiatest::Reporter* reporter, GrContext* context) { GrGpuGLShaders* shadersGpu = (GrGpuGLShaders*) context->getGpu(); |