diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-31 15:07:19 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-31 15:07:19 +0000 |
| commit | 5739d2c168819394502e20cbe6071979b9c1038c (patch) | |
| tree | 05d414a1b1041aa0979ead3c60bd3bf9585cb291 /gyp | |
| parent | 67794f5e37218aff502968bad772120317a2d10a (diff) | |
Merge GrGpuGLShaders into its parent class, GrGpuGL
Review URL: http://codereview.appspot.com/6245076/
git-svn-id: http://skia.googlecode.com/svn/trunk@4095 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gpu.gyp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index 621ea023ba..2292236d8b 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -311,8 +311,7 @@ '../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/gl/GrGpuGL_program.cpp', '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', '../src/gpu/gl/debug/GrFakeRefObj.h', |