diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-10-07 12:42:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-07 12:42:26 -0700 |
| commit | db0d3ca07008ea2c1f24d0fd9ceecf10af6ae63b (patch) | |
| tree | 12ff0bd9f07193593b7db1d52ef2fe0478c00aeb /gyp | |
| parent | fe1233c3f12f81bb675718516bbb32f72af726ec (diff) | |
Revert of Cleanup of shader building system (patchset #25 id:470001 of https://codereview.chromium.org/611653002/)
Reason for revert:
Seems to have messed up windows 7 gms
Original issue's description:
> Cleanup of shader building system
>
> this is a huge refactor and cleanup of the gl shader building system in
> Skia. The entire shader building pipeline is now part of
> GrGLProgramCreator, which takes a gp, and some fps, and creates a
> program. I added some subclasses of GrGLProgram to handle the
> eccentricities of Nvpr/Nvpres. Outside of the builders folder
> and GrGLPrograms, this change is basically just a rename
>
>
> solo gp
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/fe1233c3f12f81bb675718516bbb32f72af726ec
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/635533005
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gpu.gypi | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi index eb520b5240..074c932506 100644 --- a/gyp/gpu.gypi +++ b/gyp/gpu.gypi @@ -232,6 +232,8 @@ '<(skia_src_path)/gpu/gl/GrGLProgram.h', '<(skia_src_path)/gpu/gl/GrGLProgramDesc.cpp', '<(skia_src_path)/gpu/gl/GrGLProgramDesc.h', + '<(skia_src_path)/gpu/gl/GrGLProgramEffects.cpp', + '<(skia_src_path)/gpu/gl/GrGLProgramEffects.h', '<(skia_src_path)/gpu/gl/GrGLProgramDataManager.cpp', '<(skia_src_path)/gpu/gl/GrGLProgramDataManager.h', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp', @@ -256,17 +258,17 @@ '<(skia_src_path)/gpu/gl/GrGpuGL_program.cpp', # Files for building GLSL shaders - '<(skia_src_path)/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.cpp', - '<(skia_src_path)/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h', - '<(skia_src_path)/gpu/gl/builders/GrGLNvprProgramBuilder.cpp', - '<(skia_src_path)/gpu/gl/builders/GrGLNvprProgramBuilder.h', - '<(skia_src_path)/gpu/gl/builders/GrGLProgramBuilder.cpp', - '<(skia_src_path)/gpu/gl/builders/GrGLProgramBuilder.h', + '<(skia_src_path)/gpu/gl/builders/GrGLSLPrettyPrint.cpp', '<(skia_src_path)/gpu/gl/builders/GrGLShaderBuilder.cpp', '<(skia_src_path)/gpu/gl/builders/GrGLShaderBuilder.h', + '<(skia_src_path)/gpu/gl/builders/GrGLFragmentOnlyProgramBuilder.cpp', + '<(skia_src_path)/gpu/gl/builders/GrGLFragmentOnlyProgramBuilder.h', + '<(skia_src_path)/gpu/gl/builders/GrGLFullProgramBuilder.cpp', + '<(skia_src_path)/gpu/gl/builders/GrGLFullProgramBuilder.h', + '<(skia_src_path)/gpu/gl/builders/GrGLProgramBuilder.cpp', + '<(skia_src_path)/gpu/gl/builders/GrGLProgramBuilder.h', '<(skia_src_path)/gpu/gl/builders/GrGLShaderStringBuilder.cpp', '<(skia_src_path)/gpu/gl/builders/GrGLShaderStringBuilder.h', - '<(skia_src_path)/gpu/gl/builders/GrGLSLPrettyPrint.cpp', '<(skia_src_path)/gpu/gl/builders/GrGLVertexShaderBuilder.cpp', '<(skia_src_path)/gpu/gl/builders/GrGLVertexShaderBuilder.h', '<(skia_src_path)/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp', |