From fe1233c3f12f81bb675718516bbb32f72af726ec Mon Sep 17 00:00:00 2001 From: joshualitt Date: Tue, 7 Oct 2014 12:16:35 -0700 Subject: 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: Review URL: https://codereview.chromium.org/611653002 --- gyp/gpu.gypi | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gyp') diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi index 074c932506..eb520b5240 100644 --- a/gyp/gpu.gypi +++ b/gyp/gpu.gypi @@ -232,8 +232,6 @@ '<(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', @@ -258,17 +256,17 @@ '<(skia_src_path)/gpu/gl/GrGpuGL_program.cpp', # Files for building GLSL shaders - '<(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/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/GrGLShaderBuilder.cpp', + '<(skia_src_path)/gpu/gl/builders/GrGLShaderBuilder.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', -- cgit v1.2.3