diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-15 11:00:58 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-15 15:41:01 +0000 |
| commit | e334c596546c7ec79f2b0e55b3a1c2839a94f352 (patch) | |
| tree | e84c3c7209693de32ec8722d09d6e1bafbee74ad /gn | |
| parent | 63cef6b8c11b8f5d5584a13929e218f520a49669 (diff) | |
Attempt to work around iOS varying limit in GLPrograms test
Dump shaders when linking fails.
Bug: skia:6627
Change-Id: I7f1df4be039eb56d990aa64c58c8dd2a22d97dbe
Reviewed-on: https://skia-review.googlesource.com/16867
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/gpu.gni | 8 | ||||
| -rw-r--r-- | gn/tests.gni | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index 006267fe88..83e904b916 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -31,7 +31,6 @@ skia_gpu_sources = [ "$_include/gpu/gl/GrGLExtensions.h", "$_include/gpu/gl/GrGLFunctions.h", "$_include/gpu/gl/GrGLInterface.h", - "$_include/gpu/gl/GrGLSLPrettyPrint.h", "$_include/gpu/gl/GrGLTypes.h", # Private includes @@ -189,8 +188,8 @@ skia_gpu_sources = [ "$_src/gpu/GrTestUtils.h", "$_src/gpu/GrShaderVar.cpp", "$_src/gpu/GrShaderVar.h", - "$_src/gpu/GrSWMaskHelper.cpp", - "$_src/gpu/GrSWMaskHelper.h", + "$_src/gpu/GrSKSLPrettyPrint.cpp", + "$_src/gpu/GrSKSLPrettyPrint.h", "$_src/gpu/GrSoftwarePathRenderer.cpp", "$_src/gpu/GrSoftwarePathRenderer.h", "$_src/gpu/GrSurfacePriv.h", @@ -198,6 +197,8 @@ skia_gpu_sources = [ "$_src/gpu/GrSurfaceContext.cpp", "$_src/gpu/GrSurfaceContext.h", "$_src/gpu/GrSurfaceProxy.cpp", + "$_src/gpu/GrSWMaskHelper.cpp", + "$_src/gpu/GrSWMaskHelper.h", "$_src/gpu/GrTexture.cpp", "$_src/gpu/GrTextureAdjuster.cpp", "$_src/gpu/GrTextureAdjuster.h", @@ -424,7 +425,6 @@ skia_gpu_sources = [ "$_src/gpu/gl/builders/GrGLProgramBuilder.h", "$_src/gpu/gl/builders/GrGLShaderStringBuilder.cpp", "$_src/gpu/gl/builders/GrGLShaderStringBuilder.h", - "$_src/gpu/gl/builders/GrGLSLPrettyPrint.cpp", # GLSL "$_src/gpu/glsl/GrGLSL.cpp", diff --git a/gn/tests.gni b/gn/tests.gni index f63fb756b7..e6ac245d2c 100644 --- a/gn/tests.gni +++ b/gn/tests.gni @@ -91,10 +91,10 @@ tests_sources = [ "$_tests/GrContextAbandonTest.cpp", "$_tests/GrContextFactoryTest.cpp", "$_tests/GrDrawTargetTest.cpp", - "$_tests/GrGLSLPrettyPrintTest.cpp", "$_tests/GrMemoryPoolTest.cpp", "$_tests/GrPorterDuffTest.cpp", "$_tests/GrShapeTest.cpp", + "$_tests/GrSKSLPrettyPrintTest.cpp", "$_tests/GrSurfaceTest.cpp", "$_tests/GrTextureMipMapInvalidationTest.cpp", "$_tests/GrTRecorderTest.cpp", |