From f0d68e6c96b8682baa075849e56097315edf26eb Mon Sep 17 00:00:00 2001 From: domrjchen Date: Sat, 7 Oct 2023 14:18:48 +0800 Subject: [PATCH] Fix link error on xcode 15 and move all Processor classes into processors/ directory. --- libpag.podspec | 3 ++- tgfx/CMakeLists.txt | 2 ++ tgfx/src/core/Canvas.cpp | 8 ++++---- tgfx/src/core/Image.cpp | 4 ++-- tgfx/src/effects/BlurImageFilter.cpp | 3 +-- tgfx/src/effects/ColorMatrixFilter.cpp | 2 +- tgfx/src/effects/LumaColorFilter.cpp | 2 +- tgfx/src/effects/ModeColorFilter.cpp | 4 ++-- tgfx/src/effects/ShaderMaskFilter.cpp | 2 +- tgfx/src/gpu/GpuPaint.h | 2 +- tgfx/src/gpu/OpsRenderPass.h | 2 +- tgfx/src/gpu/Pipeline.cpp | 2 +- tgfx/src/gpu/Pipeline.h | 6 +++--- tgfx/src/gpu/ProgramBuilder.cpp | 2 +- tgfx/src/gpu/ProgramBuilder.h | 2 +- tgfx/src/gpu/ShaderBlend.cpp | 4 ++-- tgfx/src/gpu/SurfaceDrawContext.h | 2 +- tgfx/src/gpu/ops/FillRectOp.cpp | 2 +- tgfx/src/gpu/ops/RRectOp.cpp | 2 +- tgfx/src/gpu/ops/TriangulatingPathOp.cpp | 2 +- tgfx/src/gpu/{ => processors}/AARectEffect.cpp | 0 tgfx/src/gpu/{ => processors}/AARectEffect.h | 2 +- .../ClampedGradientEffect.cpp | 0 .../ClampedGradientEffect.h | 2 +- .../ColorMatrixFragmentProcessor.cpp | 2 +- .../ColorMatrixFragmentProcessor.h | 2 +- .../gpu/{ => processors}/ConstColorProcessor.cpp | 2 +- .../gpu/{ => processors}/ConstColorProcessor.h | 2 +- .../DefaultGeometryProcessor.cpp | 0 .../{ => processors}/DefaultGeometryProcessor.h | 0 .../DeviceSpaceTextureEffect.cpp | 0 .../{ => processors}/DeviceSpaceTextureEffect.h | 2 +- .../DualBlurFragmentProcessor.cpp | 2 +- .../{ => processors}/DualBlurFragmentProcessor.h | 2 +- .../DualIntervalGradientColorizer.cpp | 0 .../DualIntervalGradientColorizer.h | 2 +- .../EllipseGeometryProcessor.cpp | 0 .../{ => processors}/EllipseGeometryProcessor.h | 0 .../gpu/{ => processors}/EmptyXferProcessor.cpp | 0 .../gpu/{ => processors}/EmptyXferProcessor.h | 0 .../gpu/{ => processors}/FragmentProcessor.cpp | 6 +++--- .../src/gpu/{ => processors}/FragmentProcessor.h | 12 ++++++------ .../gpu/{ => processors}/GeometryProcessor.cpp | 0 .../src/gpu/{ => processors}/GeometryProcessor.h | 10 +++++----- .../LinearGradientLayout.cpp | 0 .../LinearGradientLayout.h | 2 +- .../gpu/{ => processors}/LumaColorFilterEffect.h | 2 +- .../{ => processors}/PorterDuffXferProcessor.cpp | 0 .../{ => processors}/PorterDuffXferProcessor.h | 2 +- tgfx/src/gpu/{ => processors}/Processor.h | 0 .../QuadPerEdgeAAGeometryProcessor.cpp | 0 .../QuadPerEdgeAAGeometryProcessor.h | 2 +- .../RadialGradientLayout.cpp | 0 .../RadialGradientLayout.h | 2 +- .../{ => processors}/SeriesFragmentProcessor.cpp | 0 .../{ => processors}/SeriesFragmentProcessor.h | 2 +- .../SingleIntervalGradientColorizer.cpp | 0 .../SingleIntervalGradientColorizer.h | 2 +- .../SweepGradientLayout.cpp | 2 +- .../SweepGradientLayout.h | 2 +- tgfx/src/gpu/{ => processors}/TextureEffect.cpp | 0 tgfx/src/gpu/{ => processors}/TextureEffect.h | 4 ++-- .../TextureGradientColorizer.cpp | 0 .../TextureGradientColorizer.h | 3 +-- .../gpu/{ => processors}/TiledTextureEffect.cpp | 2 +- .../gpu/{ => processors}/TiledTextureEffect.h | 4 ++-- .../UnrolledBinaryGradientColorizer.cpp | 0 .../UnrolledBinaryGradientColorizer.h | 2 +- tgfx/src/gpu/{ => processors}/XferProcessor.h | 2 +- .../XfermodeFragmentProcessor.cpp | 4 ++-- .../{ => processors}/XfermodeFragmentProcessor.h | 2 +- .../gpu/{ => processors}/YUVTextureEffect.cpp | 0 tgfx/src/gpu/{ => processors}/YUVTextureEffect.h | 2 +- tgfx/src/images/RGBAAAImage.cpp | 2 +- tgfx/src/images/SubsetImage.h | 2 +- tgfx/src/opengl/GLOpsRenderPass.h | 4 ++-- tgfx/src/opengl/GLProgramCreator.h | 2 +- tgfx/src/opengl/GLUniformHandler.cpp | 2 +- .../opengl/{ => processors}/GLAARectEffect.cpp | 1 - .../src/opengl/{ => processors}/GLAARectEffect.h | 2 +- .../{ => processors}/GLClampedGradientEffect.cpp | 1 - .../{ => processors}/GLClampedGradientEffect.h | 2 +- .../GLColorMatrixFragmentProcessor.cpp | 1 - .../GLColorMatrixFragmentProcessor.h | 2 +- .../{ => processors}/GLConstColorProcessor.cpp | 1 - .../{ => processors}/GLConstColorProcessor.h | 2 +- .../GLDefaultGeometryProcessor.cpp | 1 - .../GLDefaultGeometryProcessor.h | 2 +- .../GLDeviceSpaceTextureEffect.cpp | 1 - .../GLDeviceSpaceTextureEffect.h | 2 +- .../GLDualBlurFragmentProcessor.cpp | 1 - .../GLDualBlurFragmentProcessor.h | 2 +- .../GLDualIntervalGradientColorizer.cpp | 1 - .../GLDualIntervalGradientColorizer.h | 2 +- .../GLEllipseGeometryProcessor.cpp | 1 - .../GLEllipseGeometryProcessor.h | 2 +- .../{ => processors}/GLEmptyXferProcessor.cpp | 0 .../{ => processors}/GLEmptyXferProcessor.h | 2 +- .../{ => processors}/GLLinearGradientLayout.cpp | 0 .../{ => processors}/GLLinearGradientLayout.h | 2 +- .../{ => processors}/GLLumaColorFilterEffect.cpp | 0 .../{ => processors}/GLLumaColorFilterEffect.h | 2 +- .../GLPorterDuffXferProcessor.cpp | 3 +-- .../{ => processors}/GLPorterDuffXferProcessor.h | 2 +- .../GLQuadPerEdgeAAGeometryProcessor.cpp | 1 - .../GLQuadPerEdgeAAGeometryProcessor.h | 2 +- .../{ => processors}/GLRadialGradientLayout.cpp | 0 .../{ => processors}/GLRadialGradientLayout.h | 2 +- .../GLSeriesFragmentProcessor.cpp | 0 .../{ => processors}/GLSeriesFragmentProcessor.h | 2 +- .../GLSingleIntervalGradientColorizer.cpp | 1 - .../GLSingleIntervalGradientColorizer.h | 2 +- .../{ => processors}/GLSweepGradientLayout.cpp | 1 - .../{ => processors}/GLSweepGradientLayout.h | 2 +- .../opengl/{ => processors}/GLTextureEffect.cpp | 3 +-- .../opengl/{ => processors}/GLTextureEffect.h | 2 +- .../GLTextureGradientColorizer.cpp | 0 .../GLTextureGradientColorizer.h | 2 +- .../{ => processors}/GLTiledTextureEffect.cpp | 1 - .../{ => processors}/GLTiledTextureEffect.h | 2 +- .../GLUnrolledBinaryGradientColorizer.cpp | 1 - .../GLUnrolledBinaryGradientColorizer.h | 2 +- .../GLXfermodeFragmentProcessor.cpp | 5 ++--- .../GLXfermodeFragmentProcessor.h | 2 +- .../{ => processors}/GLYUVTextureEffect.cpp | 1 - .../opengl/{ => processors}/GLYUVTextureEffect.h | 2 +- tgfx/src/shaders/ColorFilterShader.cpp | 2 +- tgfx/src/shaders/ColorShader.cpp | 2 +- tgfx/src/shaders/GradientShader.cpp | 16 ++++++++-------- tgfx/src/shaders/ImageShader.cpp | 2 +- tgfx/src/shaders/LocalMatrixShader.cpp | 2 +- tgfx/src/shapes/TextureShape.cpp | 2 +- 132 files changed, 122 insertions(+), 139 deletions(-) rename tgfx/src/gpu/{ => processors}/AARectEffect.cpp (100%) rename tgfx/src/gpu/{ => processors}/AARectEffect.h (96%) rename tgfx/src/gpu/{gradients => processors}/ClampedGradientEffect.cpp (100%) rename tgfx/src/gpu/{gradients => processors}/ClampedGradientEffect.h (97%) rename tgfx/src/gpu/{ => processors}/ColorMatrixFragmentProcessor.cpp (95%) rename tgfx/src/gpu/{ => processors}/ColorMatrixFragmentProcessor.h (97%) rename tgfx/src/gpu/{ => processors}/ConstColorProcessor.cpp (96%) rename tgfx/src/gpu/{ => processors}/ConstColorProcessor.h (97%) rename tgfx/src/gpu/{ => processors}/DefaultGeometryProcessor.cpp (100%) rename tgfx/src/gpu/{ => processors}/DefaultGeometryProcessor.h (100%) rename tgfx/src/gpu/{ => processors}/DeviceSpaceTextureEffect.cpp (100%) rename tgfx/src/gpu/{ => processors}/DeviceSpaceTextureEffect.h (97%) rename tgfx/src/gpu/{ => processors}/DualBlurFragmentProcessor.cpp (97%) rename tgfx/src/gpu/{ => processors}/DualBlurFragmentProcessor.h (97%) rename tgfx/src/gpu/{gradients => processors}/DualIntervalGradientColorizer.cpp (100%) rename tgfx/src/gpu/{gradients => processors}/DualIntervalGradientColorizer.h (97%) rename tgfx/src/gpu/{ => processors}/EllipseGeometryProcessor.cpp (100%) rename tgfx/src/gpu/{ => processors}/EllipseGeometryProcessor.h (100%) rename tgfx/src/gpu/{ => processors}/EmptyXferProcessor.cpp (100%) rename tgfx/src/gpu/{ => processors}/EmptyXferProcessor.h (100%) rename tgfx/src/gpu/{ => processors}/FragmentProcessor.cpp (98%) rename tgfx/src/gpu/{ => processors}/FragmentProcessor.h (98%) rename tgfx/src/gpu/{ => processors}/GeometryProcessor.cpp (100%) rename tgfx/src/gpu/{ => processors}/GeometryProcessor.h (96%) rename tgfx/src/gpu/{gradients => processors}/LinearGradientLayout.cpp (100%) rename tgfx/src/gpu/{gradients => processors}/LinearGradientLayout.h (96%) rename tgfx/src/gpu/{ => processors}/LumaColorFilterEffect.h (96%) rename tgfx/src/gpu/{ => processors}/PorterDuffXferProcessor.cpp (100%) rename tgfx/src/gpu/{ => processors}/PorterDuffXferProcessor.h (97%) rename tgfx/src/gpu/{ => processors}/Processor.h (100%) rename tgfx/src/gpu/{ => processors}/QuadPerEdgeAAGeometryProcessor.cpp (100%) rename tgfx/src/gpu/{ => processors}/QuadPerEdgeAAGeometryProcessor.h (98%) rename tgfx/src/gpu/{gradients => processors}/RadialGradientLayout.cpp (100%) rename tgfx/src/gpu/{gradients => processors}/RadialGradientLayout.h (96%) rename tgfx/src/gpu/{ => processors}/SeriesFragmentProcessor.cpp (100%) rename tgfx/src/gpu/{ => processors}/SeriesFragmentProcessor.h (96%) rename tgfx/src/gpu/{gradients => processors}/SingleIntervalGradientColorizer.cpp (100%) rename tgfx/src/gpu/{gradients => processors}/SingleIntervalGradientColorizer.h (97%) rename tgfx/src/gpu/{gradients => processors}/SweepGradientLayout.cpp (96%) rename tgfx/src/gpu/{gradients => processors}/SweepGradientLayout.h (96%) rename tgfx/src/gpu/{ => processors}/TextureEffect.cpp (100%) rename tgfx/src/gpu/{ => processors}/TextureEffect.h (97%) rename tgfx/src/gpu/{gradients => processors}/TextureGradientColorizer.cpp (100%) rename tgfx/src/gpu/{gradients => processors}/TextureGradientColorizer.h (97%) rename tgfx/src/gpu/{ => processors}/TiledTextureEffect.cpp (99%) rename tgfx/src/gpu/{ => processors}/TiledTextureEffect.h (97%) rename tgfx/src/gpu/{gradients => processors}/UnrolledBinaryGradientColorizer.cpp (100%) rename tgfx/src/gpu/{gradients => processors}/UnrolledBinaryGradientColorizer.h (98%) rename tgfx/src/gpu/{ => processors}/XferProcessor.h (98%) rename tgfx/src/gpu/{ => processors}/XfermodeFragmentProcessor.cpp (96%) rename tgfx/src/gpu/{ => processors}/XfermodeFragmentProcessor.h (98%) rename tgfx/src/gpu/{ => processors}/YUVTextureEffect.cpp (100%) rename tgfx/src/gpu/{ => processors}/YUVTextureEffect.h (97%) rename tgfx/src/opengl/{ => processors}/GLAARectEffect.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLAARectEffect.h (96%) rename tgfx/src/opengl/{ => processors}/GLClampedGradientEffect.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLClampedGradientEffect.h (96%) rename tgfx/src/opengl/{ => processors}/GLColorMatrixFragmentProcessor.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLColorMatrixFragmentProcessor.h (95%) rename tgfx/src/opengl/{ => processors}/GLConstColorProcessor.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLConstColorProcessor.h (96%) rename tgfx/src/opengl/{ => processors}/GLDefaultGeometryProcessor.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLDefaultGeometryProcessor.h (96%) rename tgfx/src/opengl/{ => processors}/GLDeviceSpaceTextureEffect.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLDeviceSpaceTextureEffect.h (96%) rename tgfx/src/opengl/{ => processors}/GLDualBlurFragmentProcessor.cpp (99%) rename tgfx/src/opengl/{ => processors}/GLDualBlurFragmentProcessor.h (96%) rename tgfx/src/opengl/{ => processors}/GLDualIntervalGradientColorizer.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLDualIntervalGradientColorizer.h (95%) rename tgfx/src/opengl/{ => processors}/GLEllipseGeometryProcessor.cpp (99%) rename tgfx/src/opengl/{ => processors}/GLEllipseGeometryProcessor.h (96%) rename tgfx/src/opengl/{ => processors}/GLEmptyXferProcessor.cpp (100%) rename tgfx/src/opengl/{ => processors}/GLEmptyXferProcessor.h (95%) rename tgfx/src/opengl/{ => processors}/GLLinearGradientLayout.cpp (100%) rename tgfx/src/opengl/{ => processors}/GLLinearGradientLayout.h (95%) rename tgfx/src/opengl/{ => processors}/GLLumaColorFilterEffect.cpp (100%) rename tgfx/src/opengl/{ => processors}/GLLumaColorFilterEffect.h (95%) rename tgfx/src/opengl/{ => processors}/GLPorterDuffXferProcessor.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLPorterDuffXferProcessor.h (96%) rename tgfx/src/opengl/{ => processors}/GLQuadPerEdgeAAGeometryProcessor.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLQuadPerEdgeAAGeometryProcessor.h (95%) rename tgfx/src/opengl/{ => processors}/GLRadialGradientLayout.cpp (100%) rename tgfx/src/opengl/{ => processors}/GLRadialGradientLayout.h (95%) rename tgfx/src/opengl/{ => processors}/GLSeriesFragmentProcessor.cpp (100%) rename tgfx/src/opengl/{ => processors}/GLSeriesFragmentProcessor.h (95%) rename tgfx/src/opengl/{ => processors}/GLSingleIntervalGradientColorizer.cpp (97%) rename tgfx/src/opengl/{ => processors}/GLSingleIntervalGradientColorizer.h (95%) rename tgfx/src/opengl/{ => processors}/GLSweepGradientLayout.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLSweepGradientLayout.h (96%) rename tgfx/src/opengl/{ => processors}/GLTextureEffect.cpp (98%) rename tgfx/src/opengl/{ => processors}/GLTextureEffect.h (96%) rename tgfx/src/opengl/{ => processors}/GLTextureGradientColorizer.cpp (100%) rename tgfx/src/opengl/{ => processors}/GLTextureGradientColorizer.h (95%) rename tgfx/src/opengl/{ => processors}/GLTiledTextureEffect.cpp (99%) rename tgfx/src/opengl/{ => processors}/GLTiledTextureEffect.h (98%) rename tgfx/src/opengl/{ => processors}/GLUnrolledBinaryGradientColorizer.cpp (99%) rename tgfx/src/opengl/{ => processors}/GLUnrolledBinaryGradientColorizer.h (97%) rename tgfx/src/opengl/{ => processors}/GLXfermodeFragmentProcessor.cpp (97%) rename tgfx/src/opengl/{ => processors}/GLXfermodeFragmentProcessor.h (95%) rename tgfx/src/opengl/{ => processors}/GLYUVTextureEffect.cpp (99%) rename tgfx/src/opengl/{ => processors}/GLYUVTextureEffect.h (96%) diff --git a/libpag.podspec b/libpag.podspec index 62a3ddac13..5f9bf885d5 100644 --- a/libpag.podspec +++ b/libpag.podspec @@ -59,6 +59,7 @@ Pod::Spec.new do |s| 'tgfx/src/vectors/*.{h,cpp}', 'tgfx/src/gpu/**/*.{h,cpp}', 'tgfx/src/opengl/*.{h,cpp,mm}', + 'tgfx/src/opengl/processors/**/*.{h,cpp}', 'tgfx/src/platform/*.{h,cpp}', 'tgfx/src/codecs/webp/**/*.{h,cpp,mm}' @@ -99,7 +100,7 @@ Pod::Spec.new do |s| armv7CFlags = commonCFlags + ["-fno-aligned-allocation"] s.xcconfig = {'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17','CLANG_CXX_LIBRARY' => 'libc++',"HEADER_SEARCH_PATHS" => "#{PAG_ROOT}/src #{PAG_ROOT}/include #{PAG_ROOT}/tgfx/src #{PAG_ROOT}/tgfx/include #{PAG_ROOT}/third_party/pathkit #{PAG_ROOT}/third_party/skcms #{PAG_ROOT}/third_party/freetype/include #{PAG_ROOT}/third_party/libwebp/src #{PAG_ROOT}/third_party/libavc/common #{PAG_ROOT}/third_party/libavc/decoder"} - s.ios.xcconfig = {"OTHER_CFLAGS" => commonCFlags.join(" "),"OTHER_CFLAGS[sdk=iphoneos*][arch=armv7]" => armv7CFlags.join(" "),"EXPORTED_SYMBOLS_FILE" => "${PODS_ROOT}/../libpag.lds","OTHER_LDFLAGS" => "-w","VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS" => "OpenGLES"} + s.ios.xcconfig = {"OTHER_CFLAGS" => commonCFlags.join(" "),"OTHER_CFLAGS[sdk=iphoneos*][arch=armv7]" => armv7CFlags.join(" "),"EXPORTED_SYMBOLS_FILE" => "${PODS_ROOT}/../libpag.lds","OTHER_LDFLAGS" => "-w -ld64","VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS" => "OpenGLES"} s.osx.xcconfig = {"OTHER_CFLAGS" => commonCFlags.join(" ")} s.ios.vendored_frameworks = 'ios/Pods/pag-vendor/libpag-vendor.xcframework' s.osx.vendored_frameworks = 'mac/Pods/pag-vendor/libpag-vendor.xcframework' diff --git a/tgfx/CMakeLists.txt b/tgfx/CMakeLists.txt index 03b998dac2..a995074390 100644 --- a/tgfx/CMakeLists.txt +++ b/tgfx/CMakeLists.txt @@ -168,6 +168,8 @@ endif () if (TGFX_USE_OPENGL) file(GLOB GFX_PLATFORM_FILES src/opengl/*.*) list(APPEND TGFX_FILES ${GFX_PLATFORM_FILES}) + file(GLOB_RECURSE GFX_PROCESSOR_FILES src/opengl/processors/*.*) + list(APPEND TGFX_FILES ${GFX_PROCESSOR_FILES}) elseif (ANDROID) file(GLOB_RECURSE GFX_PLATFORM_FILES src/vulkan/*.*) list(APPEND TGFX_FILES ${GFX_PLATFORM_FILES}) diff --git a/tgfx/src/core/Canvas.cpp b/tgfx/src/core/Canvas.cpp index 052e363871..803f5fa35c 100644 --- a/tgfx/src/core/Canvas.cpp +++ b/tgfx/src/core/Canvas.cpp @@ -19,16 +19,16 @@ #include "tgfx/core/Canvas.h" #include #include "CanvasState.h" -#include "gpu/AARectEffect.h" -#include "gpu/ConstColorProcessor.h" -#include "gpu/DeviceSpaceTextureEffect.h" #include "gpu/GpuPaint.h" #include "gpu/SurfaceDrawContext.h" -#include "gpu/TextureEffect.h" #include "gpu/ops/ClearOp.h" #include "gpu/ops/FillRectOp.h" #include "gpu/ops/RRectOp.h" #include "gpu/ops/TriangulatingPathOp.h" +#include "gpu/processors/AARectEffect.h" +#include "gpu/processors/ConstColorProcessor.h" +#include "gpu/processors/DeviceSpaceTextureEffect.h" +#include "gpu/processors/TextureEffect.h" #include "tgfx/core/BlendMode.h" #include "tgfx/core/Mask.h" #include "tgfx/core/PathEffect.h" diff --git a/tgfx/src/core/Image.cpp b/tgfx/src/core/Image.cpp index 48c2e68fa9..0294bf4dcf 100644 --- a/tgfx/src/core/Image.cpp +++ b/tgfx/src/core/Image.cpp @@ -18,8 +18,8 @@ #include "tgfx/core/Image.h" #include "gpu/Texture.h" -#include "gpu/TextureEffect.h" -#include "gpu/TiledTextureEffect.h" +#include "gpu/processors/TextureEffect.h" +#include "gpu/processors/TiledTextureEffect.h" #include "images/ImageSource.h" #include "images/RGBAAAImage.h" #include "images/RasterBuffer.h" diff --git a/tgfx/src/effects/BlurImageFilter.cpp b/tgfx/src/effects/BlurImageFilter.cpp index 0fc3bc4992..509d62154a 100644 --- a/tgfx/src/effects/BlurImageFilter.cpp +++ b/tgfx/src/effects/BlurImageFilter.cpp @@ -17,10 +17,9 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "BlurImageFilter.h" -#include "gpu/DualBlurFragmentProcessor.h" #include "gpu/SurfaceDrawContext.h" #include "gpu/TextureSampler.h" -#include "gpu/TiledTextureEffect.h" +#include "gpu/processors/DualBlurFragmentProcessor.h" namespace tgfx { static const float BLUR_LEVEL_1_LIMIT = 10.0f; diff --git a/tgfx/src/effects/ColorMatrixFilter.cpp b/tgfx/src/effects/ColorMatrixFilter.cpp index 40fb93ab54..22aa1c3369 100644 --- a/tgfx/src/effects/ColorMatrixFilter.cpp +++ b/tgfx/src/effects/ColorMatrixFilter.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "ColorMatrixFilter.h" -#include "gpu/ColorMatrixFragmentProcessor.h" +#include "gpu/processors/ColorMatrixFragmentProcessor.h" #include "utils/MathExtra.h" namespace tgfx { diff --git a/tgfx/src/effects/LumaColorFilter.cpp b/tgfx/src/effects/LumaColorFilter.cpp index 1ec98d0b82..d8efe6eef7 100644 --- a/tgfx/src/effects/LumaColorFilter.cpp +++ b/tgfx/src/effects/LumaColorFilter.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "LumaColorFilter.h" -#include "gpu/LumaColorFilterEffect.h" +#include "gpu/processors/LumaColorFilterEffect.h" namespace tgfx { std::shared_ptr ColorFilter::MakeLumaColorFilter() { diff --git a/tgfx/src/effects/ModeColorFilter.cpp b/tgfx/src/effects/ModeColorFilter.cpp index f00e8589be..7609950632 100644 --- a/tgfx/src/effects/ModeColorFilter.cpp +++ b/tgfx/src/effects/ModeColorFilter.cpp @@ -17,8 +17,8 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "ModeColorFilter.h" -#include "gpu/ConstColorProcessor.h" -#include "gpu/XfermodeFragmentProcessor.h" +#include "gpu/processors/ConstColorProcessor.h" +#include "gpu/processors/XfermodeFragmentProcessor.h" namespace tgfx { static bool IsNoOps(float alpha, BlendMode mode) { diff --git a/tgfx/src/effects/ShaderMaskFilter.cpp b/tgfx/src/effects/ShaderMaskFilter.cpp index 21dac5bb2c..5c5e29f6c7 100644 --- a/tgfx/src/effects/ShaderMaskFilter.cpp +++ b/tgfx/src/effects/ShaderMaskFilter.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "ShaderMaskFilter.h" -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { std::shared_ptr MaskFilter::Make(std::shared_ptr shader, bool inverted) { diff --git a/tgfx/src/gpu/GpuPaint.h b/tgfx/src/gpu/GpuPaint.h index 15a0aa083e..1cb39f7ce7 100644 --- a/tgfx/src/gpu/GpuPaint.h +++ b/tgfx/src/gpu/GpuPaint.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class GpuPaint { diff --git a/tgfx/src/gpu/OpsRenderPass.h b/tgfx/src/gpu/OpsRenderPass.h index 61e998eff6..0029c5b676 100644 --- a/tgfx/src/gpu/OpsRenderPass.h +++ b/tgfx/src/gpu/OpsRenderPass.h @@ -20,11 +20,11 @@ #include #include "Blend.h" -#include "GeometryProcessor.h" #include "GpuBuffer.h" #include "Pipeline.h" #include "Program.h" #include "gpu/RenderTarget.h" +#include "gpu/processors/GeometryProcessor.h" #include "tgfx/core/BlendMode.h" #include "tgfx/core/Color.h" #include "tgfx/gpu/Context.h" diff --git a/tgfx/src/gpu/Pipeline.cpp b/tgfx/src/gpu/Pipeline.cpp index ef999d385b..c0ddf669c7 100644 --- a/tgfx/src/gpu/Pipeline.cpp +++ b/tgfx/src/gpu/Pipeline.cpp @@ -17,8 +17,8 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "Pipeline.h" -#include "gpu/PorterDuffXferProcessor.h" #include "gpu/TextureSampler.h" +#include "gpu/processors/PorterDuffXferProcessor.h" namespace tgfx { Pipeline::Pipeline(std::unique_ptr geometryProcessor, diff --git a/tgfx/src/gpu/Pipeline.h b/tgfx/src/gpu/Pipeline.h index 2e12bc8817..a571f46226 100644 --- a/tgfx/src/gpu/Pipeline.h +++ b/tgfx/src/gpu/Pipeline.h @@ -18,11 +18,11 @@ #pragma once -#include "EmptyXferProcessor.h" #include "Swizzle.h" #include "gpu/Blend.h" -#include "gpu/FragmentProcessor.h" -#include "gpu/GeometryProcessor.h" +#include "gpu/processors/EmptyXferProcessor.h" +#include "gpu/processors/FragmentProcessor.h" +#include "gpu/processors/GeometryProcessor.h" namespace tgfx { /** diff --git a/tgfx/src/gpu/ProgramBuilder.cpp b/tgfx/src/gpu/ProgramBuilder.cpp index 12b767ef58..1363ec1ab3 100644 --- a/tgfx/src/gpu/ProgramBuilder.cpp +++ b/tgfx/src/gpu/ProgramBuilder.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "ProgramBuilder.h" -#include "FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { ProgramBuilder::ProgramBuilder(Context* context, const Pipeline* pipeline) diff --git a/tgfx/src/gpu/ProgramBuilder.h b/tgfx/src/gpu/ProgramBuilder.h index 7426133697..3dff898c1c 100644 --- a/tgfx/src/gpu/ProgramBuilder.h +++ b/tgfx/src/gpu/ProgramBuilder.h @@ -19,11 +19,11 @@ #pragma once #include "FragmentShaderBuilder.h" -#include "GeometryProcessor.h" #include "Pipeline.h" #include "UniformHandler.h" #include "VaryingHandler.h" #include "VertexShaderBuilder.h" +#include "gpu/processors/GeometryProcessor.h" namespace tgfx { class ProgramBuilder { diff --git a/tgfx/src/gpu/ShaderBlend.cpp b/tgfx/src/gpu/ShaderBlend.cpp index 482af667a1..8edb08159d 100644 --- a/tgfx/src/gpu/ShaderBlend.cpp +++ b/tgfx/src/gpu/ShaderBlend.cpp @@ -17,8 +17,8 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "ShaderBlend.h" -#include "gpu/FragmentProcessor.h" -#include "gpu/XfermodeFragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" +#include "gpu/processors/XfermodeFragmentProcessor.h" namespace tgfx { std::shared_ptr Shader::MakeBlend(BlendMode mode, std::shared_ptr dst, diff --git a/tgfx/src/gpu/SurfaceDrawContext.h b/tgfx/src/gpu/SurfaceDrawContext.h index 2ffde1d652..4a02b3dd2b 100644 --- a/tgfx/src/gpu/SurfaceDrawContext.h +++ b/tgfx/src/gpu/SurfaceDrawContext.h @@ -18,8 +18,8 @@ #pragma once -#include "gpu/FragmentProcessor.h" #include "gpu/ops/OpsTask.h" +#include "gpu/processors/FragmentProcessor.h" #include "tgfx/core/Matrix.h" #include "tgfx/core/Rect.h" #include "tgfx/gpu/Surface.h" diff --git a/tgfx/src/gpu/ops/FillRectOp.cpp b/tgfx/src/gpu/ops/FillRectOp.cpp index cd85587c0f..26168842db 100644 --- a/tgfx/src/gpu/ops/FillRectOp.cpp +++ b/tgfx/src/gpu/ops/FillRectOp.cpp @@ -19,8 +19,8 @@ #include "FillRectOp.h" #include "gpu/Gpu.h" #include "gpu/Quad.h" -#include "gpu/QuadPerEdgeAAGeometryProcessor.h" #include "gpu/ResourceProvider.h" +#include "gpu/processors/QuadPerEdgeAAGeometryProcessor.h" #include "utils/UniqueID.h" namespace tgfx { diff --git a/tgfx/src/gpu/ops/RRectOp.cpp b/tgfx/src/gpu/ops/RRectOp.cpp index cee68bca2c..da9b1f6269 100644 --- a/tgfx/src/gpu/ops/RRectOp.cpp +++ b/tgfx/src/gpu/ops/RRectOp.cpp @@ -17,9 +17,9 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "RRectOp.h" -#include "gpu/EllipseGeometryProcessor.h" #include "gpu/Gpu.h" #include "gpu/GpuBuffer.h" +#include "gpu/processors/EllipseGeometryProcessor.h" #include "utils/MathExtra.h" namespace tgfx { diff --git a/tgfx/src/gpu/ops/TriangulatingPathOp.cpp b/tgfx/src/gpu/ops/TriangulatingPathOp.cpp index f4e511e6dd..fc3b0e1a5b 100644 --- a/tgfx/src/gpu/ops/TriangulatingPathOp.cpp +++ b/tgfx/src/gpu/ops/TriangulatingPathOp.cpp @@ -18,8 +18,8 @@ #include "TriangulatingPathOp.h" #include "core/PathRef.h" -#include "gpu/DefaultGeometryProcessor.h" #include "gpu/Gpu.h" +#include "gpu/processors/DefaultGeometryProcessor.h" namespace tgfx { std::unique_ptr TriangulatingPathOp::Make(Color color, const Path& path, diff --git a/tgfx/src/gpu/AARectEffect.cpp b/tgfx/src/gpu/processors/AARectEffect.cpp similarity index 100% rename from tgfx/src/gpu/AARectEffect.cpp rename to tgfx/src/gpu/processors/AARectEffect.cpp diff --git a/tgfx/src/gpu/AARectEffect.h b/tgfx/src/gpu/processors/AARectEffect.h similarity index 96% rename from tgfx/src/gpu/AARectEffect.h rename to tgfx/src/gpu/processors/AARectEffect.h index 564f25f07d..3be5a941a9 100644 --- a/tgfx/src/gpu/AARectEffect.h +++ b/tgfx/src/gpu/processors/AARectEffect.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class AARectEffect : public FragmentProcessor { diff --git a/tgfx/src/gpu/gradients/ClampedGradientEffect.cpp b/tgfx/src/gpu/processors/ClampedGradientEffect.cpp similarity index 100% rename from tgfx/src/gpu/gradients/ClampedGradientEffect.cpp rename to tgfx/src/gpu/processors/ClampedGradientEffect.cpp diff --git a/tgfx/src/gpu/gradients/ClampedGradientEffect.h b/tgfx/src/gpu/processors/ClampedGradientEffect.h similarity index 97% rename from tgfx/src/gpu/gradients/ClampedGradientEffect.h rename to tgfx/src/gpu/processors/ClampedGradientEffect.h index 07077b7d72..8e52f135c1 100644 --- a/tgfx/src/gpu/gradients/ClampedGradientEffect.h +++ b/tgfx/src/gpu/processors/ClampedGradientEffect.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/gpu/ColorMatrixFragmentProcessor.cpp b/tgfx/src/gpu/processors/ColorMatrixFragmentProcessor.cpp similarity index 95% rename from tgfx/src/gpu/ColorMatrixFragmentProcessor.cpp rename to tgfx/src/gpu/processors/ColorMatrixFragmentProcessor.cpp index 67d2f547fd..b1b9a83029 100644 --- a/tgfx/src/gpu/ColorMatrixFragmentProcessor.cpp +++ b/tgfx/src/gpu/processors/ColorMatrixFragmentProcessor.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "gpu/ColorMatrixFragmentProcessor.h" +#include "gpu/processors/ColorMatrixFragmentProcessor.h" namespace tgfx { bool ColorMatrixFragmentProcessor::onIsEqual(const FragmentProcessor& processor) const { diff --git a/tgfx/src/gpu/ColorMatrixFragmentProcessor.h b/tgfx/src/gpu/processors/ColorMatrixFragmentProcessor.h similarity index 97% rename from tgfx/src/gpu/ColorMatrixFragmentProcessor.h rename to tgfx/src/gpu/processors/ColorMatrixFragmentProcessor.h index dfa0332b98..b8b6f3b93c 100644 --- a/tgfx/src/gpu/ColorMatrixFragmentProcessor.h +++ b/tgfx/src/gpu/processors/ColorMatrixFragmentProcessor.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class ColorMatrixFragmentProcessor : public FragmentProcessor { diff --git a/tgfx/src/gpu/ConstColorProcessor.cpp b/tgfx/src/gpu/processors/ConstColorProcessor.cpp similarity index 96% rename from tgfx/src/gpu/ConstColorProcessor.cpp rename to tgfx/src/gpu/processors/ConstColorProcessor.cpp index 241e6176b3..13834ca915 100644 --- a/tgfx/src/gpu/ConstColorProcessor.cpp +++ b/tgfx/src/gpu/processors/ConstColorProcessor.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "gpu/ConstColorProcessor.h" +#include "gpu/processors/ConstColorProcessor.h" namespace tgfx { void ConstColorProcessor::onComputeProcessorKey(BytesKey* bytesKey) const { diff --git a/tgfx/src/gpu/ConstColorProcessor.h b/tgfx/src/gpu/processors/ConstColorProcessor.h similarity index 97% rename from tgfx/src/gpu/ConstColorProcessor.h rename to tgfx/src/gpu/processors/ConstColorProcessor.h index 62bd2f0958..f0f4925f9d 100644 --- a/tgfx/src/gpu/ConstColorProcessor.h +++ b/tgfx/src/gpu/processors/ConstColorProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/gpu/DefaultGeometryProcessor.cpp b/tgfx/src/gpu/processors/DefaultGeometryProcessor.cpp similarity index 100% rename from tgfx/src/gpu/DefaultGeometryProcessor.cpp rename to tgfx/src/gpu/processors/DefaultGeometryProcessor.cpp diff --git a/tgfx/src/gpu/DefaultGeometryProcessor.h b/tgfx/src/gpu/processors/DefaultGeometryProcessor.h similarity index 100% rename from tgfx/src/gpu/DefaultGeometryProcessor.h rename to tgfx/src/gpu/processors/DefaultGeometryProcessor.h diff --git a/tgfx/src/gpu/DeviceSpaceTextureEffect.cpp b/tgfx/src/gpu/processors/DeviceSpaceTextureEffect.cpp similarity index 100% rename from tgfx/src/gpu/DeviceSpaceTextureEffect.cpp rename to tgfx/src/gpu/processors/DeviceSpaceTextureEffect.cpp diff --git a/tgfx/src/gpu/DeviceSpaceTextureEffect.h b/tgfx/src/gpu/processors/DeviceSpaceTextureEffect.h similarity index 97% rename from tgfx/src/gpu/DeviceSpaceTextureEffect.h rename to tgfx/src/gpu/processors/DeviceSpaceTextureEffect.h index 881a36b0e5..912a62eea0 100644 --- a/tgfx/src/gpu/DeviceSpaceTextureEffect.h +++ b/tgfx/src/gpu/processors/DeviceSpaceTextureEffect.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class DeviceSpaceTextureEffect : public FragmentProcessor { diff --git a/tgfx/src/gpu/DualBlurFragmentProcessor.cpp b/tgfx/src/gpu/processors/DualBlurFragmentProcessor.cpp similarity index 97% rename from tgfx/src/gpu/DualBlurFragmentProcessor.cpp rename to tgfx/src/gpu/processors/DualBlurFragmentProcessor.cpp index 0b44e4f1c7..2f7bfe7974 100644 --- a/tgfx/src/gpu/DualBlurFragmentProcessor.cpp +++ b/tgfx/src/gpu/processors/DualBlurFragmentProcessor.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "gpu/DualBlurFragmentProcessor.h" +#include "gpu/processors/DualBlurFragmentProcessor.h" namespace tgfx { DualBlurFragmentProcessor::DualBlurFragmentProcessor(DualBlurPassMode passMode, diff --git a/tgfx/src/gpu/DualBlurFragmentProcessor.h b/tgfx/src/gpu/processors/DualBlurFragmentProcessor.h similarity index 97% rename from tgfx/src/gpu/DualBlurFragmentProcessor.h rename to tgfx/src/gpu/processors/DualBlurFragmentProcessor.h index 242f03a043..518d5fbebf 100644 --- a/tgfx/src/gpu/DualBlurFragmentProcessor.h +++ b/tgfx/src/gpu/processors/DualBlurFragmentProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { enum class DualBlurPassMode { Up = 0, Down = 1 }; diff --git a/tgfx/src/gpu/gradients/DualIntervalGradientColorizer.cpp b/tgfx/src/gpu/processors/DualIntervalGradientColorizer.cpp similarity index 100% rename from tgfx/src/gpu/gradients/DualIntervalGradientColorizer.cpp rename to tgfx/src/gpu/processors/DualIntervalGradientColorizer.cpp diff --git a/tgfx/src/gpu/gradients/DualIntervalGradientColorizer.h b/tgfx/src/gpu/processors/DualIntervalGradientColorizer.h similarity index 97% rename from tgfx/src/gpu/gradients/DualIntervalGradientColorizer.h rename to tgfx/src/gpu/processors/DualIntervalGradientColorizer.h index d9e63174b1..8239e1d0cb 100644 --- a/tgfx/src/gpu/gradients/DualIntervalGradientColorizer.h +++ b/tgfx/src/gpu/processors/DualIntervalGradientColorizer.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/gpu/EllipseGeometryProcessor.cpp b/tgfx/src/gpu/processors/EllipseGeometryProcessor.cpp similarity index 100% rename from tgfx/src/gpu/EllipseGeometryProcessor.cpp rename to tgfx/src/gpu/processors/EllipseGeometryProcessor.cpp diff --git a/tgfx/src/gpu/EllipseGeometryProcessor.h b/tgfx/src/gpu/processors/EllipseGeometryProcessor.h similarity index 100% rename from tgfx/src/gpu/EllipseGeometryProcessor.h rename to tgfx/src/gpu/processors/EllipseGeometryProcessor.h diff --git a/tgfx/src/gpu/EmptyXferProcessor.cpp b/tgfx/src/gpu/processors/EmptyXferProcessor.cpp similarity index 100% rename from tgfx/src/gpu/EmptyXferProcessor.cpp rename to tgfx/src/gpu/processors/EmptyXferProcessor.cpp diff --git a/tgfx/src/gpu/EmptyXferProcessor.h b/tgfx/src/gpu/processors/EmptyXferProcessor.h similarity index 100% rename from tgfx/src/gpu/EmptyXferProcessor.h rename to tgfx/src/gpu/processors/EmptyXferProcessor.h diff --git a/tgfx/src/gpu/FragmentProcessor.cpp b/tgfx/src/gpu/processors/FragmentProcessor.cpp similarity index 98% rename from tgfx/src/gpu/FragmentProcessor.cpp rename to tgfx/src/gpu/processors/FragmentProcessor.cpp index 62c710d49c..6d5f6ece95 100644 --- a/tgfx/src/gpu/FragmentProcessor.cpp +++ b/tgfx/src/gpu/processors/FragmentProcessor.cpp @@ -16,10 +16,10 @@ // ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "gpu/FragmentProcessor.h" -#include "Pipeline.h" +#include "gpu/processors/FragmentProcessor.h" #include "SeriesFragmentProcessor.h" -#include "gpu/XfermodeFragmentProcessor.h" +#include "gpu/Pipeline.h" +#include "gpu/processors/XfermodeFragmentProcessor.h" namespace tgfx { bool ComputeTotalInverse(const FPArgs& args, Matrix* totalInverse) { diff --git a/tgfx/src/gpu/FragmentProcessor.h b/tgfx/src/gpu/processors/FragmentProcessor.h similarity index 98% rename from tgfx/src/gpu/FragmentProcessor.h rename to tgfx/src/gpu/processors/FragmentProcessor.h index 3fb34c2fff..c886665f0b 100644 --- a/tgfx/src/gpu/FragmentProcessor.h +++ b/tgfx/src/gpu/processors/FragmentProcessor.h @@ -19,14 +19,14 @@ #pragma once #include -#include "CoordTransform.h" -#include "FragmentShaderBuilder.h" -#include "Processor.h" -#include "SamplerState.h" -#include "TextureProxy.h" -#include "UniformHandler.h" +#include "gpu/CoordTransform.h" +#include "gpu/FragmentShaderBuilder.h" +#include "gpu/SamplerState.h" #include "gpu/Texture.h" +#include "gpu/TextureProxy.h" #include "gpu/UniformBuffer.h" +#include "gpu/UniformHandler.h" +#include "gpu/processors/Processor.h" namespace tgfx { struct FPArgs { diff --git a/tgfx/src/gpu/GeometryProcessor.cpp b/tgfx/src/gpu/processors/GeometryProcessor.cpp similarity index 100% rename from tgfx/src/gpu/GeometryProcessor.cpp rename to tgfx/src/gpu/processors/GeometryProcessor.cpp diff --git a/tgfx/src/gpu/GeometryProcessor.h b/tgfx/src/gpu/processors/GeometryProcessor.h similarity index 96% rename from tgfx/src/gpu/GeometryProcessor.h rename to tgfx/src/gpu/processors/GeometryProcessor.h index 24f55e1011..5c6bee82c5 100644 --- a/tgfx/src/gpu/GeometryProcessor.h +++ b/tgfx/src/gpu/processors/GeometryProcessor.h @@ -19,15 +19,15 @@ #pragma once #include -#include "FragmentShaderBuilder.h" -#include "Processor.h" -#include "ShaderVar.h" -#include "VertexShaderBuilder.h" -#include "gpu/FragmentProcessor.h" +#include "gpu/FragmentShaderBuilder.h" +#include "gpu/ShaderVar.h" #include "gpu/TextureSampler.h" #include "gpu/UniformBuffer.h" #include "gpu/UniformHandler.h" #include "gpu/VaryingHandler.h" +#include "gpu/VertexShaderBuilder.h" +#include "gpu/processors/FragmentProcessor.h" +#include "gpu/processors/Processor.h" namespace tgfx { class GeometryProcessor : public Processor { diff --git a/tgfx/src/gpu/gradients/LinearGradientLayout.cpp b/tgfx/src/gpu/processors/LinearGradientLayout.cpp similarity index 100% rename from tgfx/src/gpu/gradients/LinearGradientLayout.cpp rename to tgfx/src/gpu/processors/LinearGradientLayout.cpp diff --git a/tgfx/src/gpu/gradients/LinearGradientLayout.h b/tgfx/src/gpu/processors/LinearGradientLayout.h similarity index 96% rename from tgfx/src/gpu/gradients/LinearGradientLayout.h rename to tgfx/src/gpu/processors/LinearGradientLayout.h index 2445c3afb2..06511a518f 100644 --- a/tgfx/src/gpu/gradients/LinearGradientLayout.h +++ b/tgfx/src/gpu/processors/LinearGradientLayout.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class LinearGradientLayout : public FragmentProcessor { diff --git a/tgfx/src/gpu/LumaColorFilterEffect.h b/tgfx/src/gpu/processors/LumaColorFilterEffect.h similarity index 96% rename from tgfx/src/gpu/LumaColorFilterEffect.h rename to tgfx/src/gpu/processors/LumaColorFilterEffect.h index 1c65f8d4de..1e244e469c 100644 --- a/tgfx/src/gpu/LumaColorFilterEffect.h +++ b/tgfx/src/gpu/processors/LumaColorFilterEffect.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class LumaColorFilterEffect : public FragmentProcessor { diff --git a/tgfx/src/gpu/PorterDuffXferProcessor.cpp b/tgfx/src/gpu/processors/PorterDuffXferProcessor.cpp similarity index 100% rename from tgfx/src/gpu/PorterDuffXferProcessor.cpp rename to tgfx/src/gpu/processors/PorterDuffXferProcessor.cpp diff --git a/tgfx/src/gpu/PorterDuffXferProcessor.h b/tgfx/src/gpu/processors/PorterDuffXferProcessor.h similarity index 97% rename from tgfx/src/gpu/PorterDuffXferProcessor.h rename to tgfx/src/gpu/processors/PorterDuffXferProcessor.h index 79b6387820..636a8ec535 100644 --- a/tgfx/src/gpu/PorterDuffXferProcessor.h +++ b/tgfx/src/gpu/processors/PorterDuffXferProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "XferProcessor.h" +#include "gpu/processors/XferProcessor.h" #include "tgfx/core/BlendMode.h" namespace tgfx { diff --git a/tgfx/src/gpu/Processor.h b/tgfx/src/gpu/processors/Processor.h similarity index 100% rename from tgfx/src/gpu/Processor.h rename to tgfx/src/gpu/processors/Processor.h diff --git a/tgfx/src/gpu/QuadPerEdgeAAGeometryProcessor.cpp b/tgfx/src/gpu/processors/QuadPerEdgeAAGeometryProcessor.cpp similarity index 100% rename from tgfx/src/gpu/QuadPerEdgeAAGeometryProcessor.cpp rename to tgfx/src/gpu/processors/QuadPerEdgeAAGeometryProcessor.cpp diff --git a/tgfx/src/gpu/QuadPerEdgeAAGeometryProcessor.h b/tgfx/src/gpu/processors/QuadPerEdgeAAGeometryProcessor.h similarity index 98% rename from tgfx/src/gpu/QuadPerEdgeAAGeometryProcessor.h rename to tgfx/src/gpu/processors/QuadPerEdgeAAGeometryProcessor.h index 6514d56a17..12a7897b19 100644 --- a/tgfx/src/gpu/QuadPerEdgeAAGeometryProcessor.h +++ b/tgfx/src/gpu/processors/QuadPerEdgeAAGeometryProcessor.h @@ -18,8 +18,8 @@ #pragma once -#include "AAType.h" #include "GeometryProcessor.h" +#include "gpu/AAType.h" #include "tgfx/core/Paint.h" namespace tgfx { diff --git a/tgfx/src/gpu/gradients/RadialGradientLayout.cpp b/tgfx/src/gpu/processors/RadialGradientLayout.cpp similarity index 100% rename from tgfx/src/gpu/gradients/RadialGradientLayout.cpp rename to tgfx/src/gpu/processors/RadialGradientLayout.cpp diff --git a/tgfx/src/gpu/gradients/RadialGradientLayout.h b/tgfx/src/gpu/processors/RadialGradientLayout.h similarity index 96% rename from tgfx/src/gpu/gradients/RadialGradientLayout.h rename to tgfx/src/gpu/processors/RadialGradientLayout.h index 56c145af08..c9d4ab13fe 100644 --- a/tgfx/src/gpu/gradients/RadialGradientLayout.h +++ b/tgfx/src/gpu/processors/RadialGradientLayout.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class RadialGradientLayout : public FragmentProcessor { diff --git a/tgfx/src/gpu/SeriesFragmentProcessor.cpp b/tgfx/src/gpu/processors/SeriesFragmentProcessor.cpp similarity index 100% rename from tgfx/src/gpu/SeriesFragmentProcessor.cpp rename to tgfx/src/gpu/processors/SeriesFragmentProcessor.cpp diff --git a/tgfx/src/gpu/SeriesFragmentProcessor.h b/tgfx/src/gpu/processors/SeriesFragmentProcessor.h similarity index 96% rename from tgfx/src/gpu/SeriesFragmentProcessor.h rename to tgfx/src/gpu/processors/SeriesFragmentProcessor.h index 61e933bc56..6d8d7fff4d 100644 --- a/tgfx/src/gpu/SeriesFragmentProcessor.h +++ b/tgfx/src/gpu/processors/SeriesFragmentProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class SeriesFragmentProcessor : public FragmentProcessor { diff --git a/tgfx/src/gpu/gradients/SingleIntervalGradientColorizer.cpp b/tgfx/src/gpu/processors/SingleIntervalGradientColorizer.cpp similarity index 100% rename from tgfx/src/gpu/gradients/SingleIntervalGradientColorizer.cpp rename to tgfx/src/gpu/processors/SingleIntervalGradientColorizer.cpp diff --git a/tgfx/src/gpu/gradients/SingleIntervalGradientColorizer.h b/tgfx/src/gpu/processors/SingleIntervalGradientColorizer.h similarity index 97% rename from tgfx/src/gpu/gradients/SingleIntervalGradientColorizer.h rename to tgfx/src/gpu/processors/SingleIntervalGradientColorizer.h index 2cceafa935..80ef76b37a 100644 --- a/tgfx/src/gpu/gradients/SingleIntervalGradientColorizer.h +++ b/tgfx/src/gpu/processors/SingleIntervalGradientColorizer.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/gpu/gradients/SweepGradientLayout.cpp b/tgfx/src/gpu/processors/SweepGradientLayout.cpp similarity index 96% rename from tgfx/src/gpu/gradients/SweepGradientLayout.cpp rename to tgfx/src/gpu/processors/SweepGradientLayout.cpp index 57bacfa4a5..ab19a64ea9 100644 --- a/tgfx/src/gpu/gradients/SweepGradientLayout.cpp +++ b/tgfx/src/gpu/processors/SweepGradientLayout.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "gpu/gradients/SweepGradientLayout.h" +#include "SweepGradientLayout.h" namespace tgfx { SweepGradientLayout::SweepGradientLayout(Matrix matrix, float bias, float scale) diff --git a/tgfx/src/gpu/gradients/SweepGradientLayout.h b/tgfx/src/gpu/processors/SweepGradientLayout.h similarity index 96% rename from tgfx/src/gpu/gradients/SweepGradientLayout.h rename to tgfx/src/gpu/processors/SweepGradientLayout.h index f91561e166..c6759e3d42 100644 --- a/tgfx/src/gpu/gradients/SweepGradientLayout.h +++ b/tgfx/src/gpu/processors/SweepGradientLayout.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class SweepGradientLayout : public FragmentProcessor { diff --git a/tgfx/src/gpu/TextureEffect.cpp b/tgfx/src/gpu/processors/TextureEffect.cpp similarity index 100% rename from tgfx/src/gpu/TextureEffect.cpp rename to tgfx/src/gpu/processors/TextureEffect.cpp diff --git a/tgfx/src/gpu/TextureEffect.h b/tgfx/src/gpu/processors/TextureEffect.h similarity index 97% rename from tgfx/src/gpu/TextureEffect.h rename to tgfx/src/gpu/processors/TextureEffect.h index 78d4064b6f..75dababe43 100644 --- a/tgfx/src/gpu/TextureEffect.h +++ b/tgfx/src/gpu/processors/TextureEffect.h @@ -18,9 +18,9 @@ #pragma once -#include "SamplerState.h" -#include "gpu/FragmentProcessor.h" +#include "gpu/SamplerState.h" #include "gpu/TextureProxy.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class TextureEffect : public FragmentProcessor { diff --git a/tgfx/src/gpu/gradients/TextureGradientColorizer.cpp b/tgfx/src/gpu/processors/TextureGradientColorizer.cpp similarity index 100% rename from tgfx/src/gpu/gradients/TextureGradientColorizer.cpp rename to tgfx/src/gpu/processors/TextureGradientColorizer.cpp diff --git a/tgfx/src/gpu/gradients/TextureGradientColorizer.h b/tgfx/src/gpu/processors/TextureGradientColorizer.h similarity index 97% rename from tgfx/src/gpu/gradients/TextureGradientColorizer.h rename to tgfx/src/gpu/processors/TextureGradientColorizer.h index 287885bccc..5eeb3c5fac 100644 --- a/tgfx/src/gpu/gradients/TextureGradientColorizer.h +++ b/tgfx/src/gpu/processors/TextureGradientColorizer.h @@ -19,8 +19,7 @@ #pragma once #include - -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class TextureGradientColorizer : public FragmentProcessor { diff --git a/tgfx/src/gpu/TiledTextureEffect.cpp b/tgfx/src/gpu/processors/TiledTextureEffect.cpp similarity index 99% rename from tgfx/src/gpu/TiledTextureEffect.cpp rename to tgfx/src/gpu/processors/TiledTextureEffect.cpp index bf4648d028..f24a55a968 100644 --- a/tgfx/src/gpu/TiledTextureEffect.cpp +++ b/tgfx/src/gpu/processors/TiledTextureEffect.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "gpu/TiledTextureEffect.h" +#include "TiledTextureEffect.h" #include "ConstColorProcessor.h" #include "TextureEffect.h" #include "utils/MathExtra.h" diff --git a/tgfx/src/gpu/TiledTextureEffect.h b/tgfx/src/gpu/processors/TiledTextureEffect.h similarity index 97% rename from tgfx/src/gpu/TiledTextureEffect.h rename to tgfx/src/gpu/processors/TiledTextureEffect.h index fa3ccfc720..d7b44c41c0 100644 --- a/tgfx/src/gpu/TiledTextureEffect.h +++ b/tgfx/src/gpu/processors/TiledTextureEffect.h @@ -18,9 +18,9 @@ #pragma once -#include "SamplerState.h" -#include "gpu/FragmentProcessor.h" +#include "gpu/SamplerState.h" #include "gpu/TextureProxy.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class TiledTextureEffect : public FragmentProcessor { diff --git a/tgfx/src/gpu/gradients/UnrolledBinaryGradientColorizer.cpp b/tgfx/src/gpu/processors/UnrolledBinaryGradientColorizer.cpp similarity index 100% rename from tgfx/src/gpu/gradients/UnrolledBinaryGradientColorizer.cpp rename to tgfx/src/gpu/processors/UnrolledBinaryGradientColorizer.cpp diff --git a/tgfx/src/gpu/gradients/UnrolledBinaryGradientColorizer.h b/tgfx/src/gpu/processors/UnrolledBinaryGradientColorizer.h similarity index 98% rename from tgfx/src/gpu/gradients/UnrolledBinaryGradientColorizer.h rename to tgfx/src/gpu/processors/UnrolledBinaryGradientColorizer.h index 13c8f2cebf..ea20f1a40a 100644 --- a/tgfx/src/gpu/gradients/UnrolledBinaryGradientColorizer.h +++ b/tgfx/src/gpu/processors/UnrolledBinaryGradientColorizer.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/gpu/XferProcessor.h b/tgfx/src/gpu/processors/XferProcessor.h similarity index 98% rename from tgfx/src/gpu/XferProcessor.h rename to tgfx/src/gpu/processors/XferProcessor.h index 321841c49f..d068ce08da 100644 --- a/tgfx/src/gpu/XferProcessor.h +++ b/tgfx/src/gpu/processors/XferProcessor.h @@ -19,11 +19,11 @@ #pragma once #include -#include "Processor.h" #include "gpu/FragmentShaderBuilder.h" #include "gpu/Texture.h" #include "gpu/UniformBuffer.h" #include "gpu/UniformHandler.h" +#include "gpu/processors/Processor.h" #include "tgfx/utils/BytesKey.h" namespace tgfx { diff --git a/tgfx/src/gpu/XfermodeFragmentProcessor.cpp b/tgfx/src/gpu/processors/XfermodeFragmentProcessor.cpp similarity index 96% rename from tgfx/src/gpu/XfermodeFragmentProcessor.cpp rename to tgfx/src/gpu/processors/XfermodeFragmentProcessor.cpp index 1581532949..df97dd5546 100644 --- a/tgfx/src/gpu/XfermodeFragmentProcessor.cpp +++ b/tgfx/src/gpu/processors/XfermodeFragmentProcessor.cpp @@ -16,8 +16,8 @@ // ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "gpu/XfermodeFragmentProcessor.h" -#include "gpu/ConstColorProcessor.h" +#include "XfermodeFragmentProcessor.h" +#include "gpu/processors/ConstColorProcessor.h" namespace tgfx { std::unique_ptr XfermodeFragmentProcessor::MakeFromSrcProcessor( diff --git a/tgfx/src/gpu/XfermodeFragmentProcessor.h b/tgfx/src/gpu/processors/XfermodeFragmentProcessor.h similarity index 98% rename from tgfx/src/gpu/XfermodeFragmentProcessor.h rename to tgfx/src/gpu/processors/XfermodeFragmentProcessor.h index ced954f5d7..100e3f3f22 100644 --- a/tgfx/src/gpu/XfermodeFragmentProcessor.h +++ b/tgfx/src/gpu/processors/XfermodeFragmentProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" #include "tgfx/core/BlendMode.h" namespace tgfx { diff --git a/tgfx/src/gpu/YUVTextureEffect.cpp b/tgfx/src/gpu/processors/YUVTextureEffect.cpp similarity index 100% rename from tgfx/src/gpu/YUVTextureEffect.cpp rename to tgfx/src/gpu/processors/YUVTextureEffect.cpp diff --git a/tgfx/src/gpu/YUVTextureEffect.h b/tgfx/src/gpu/processors/YUVTextureEffect.h similarity index 97% rename from tgfx/src/gpu/YUVTextureEffect.h rename to tgfx/src/gpu/processors/YUVTextureEffect.h index a83d20404c..7b2acf0e18 100644 --- a/tgfx/src/gpu/YUVTextureEffect.h +++ b/tgfx/src/gpu/processors/YUVTextureEffect.h @@ -18,8 +18,8 @@ #pragma once -#include "gpu/FragmentProcessor.h" #include "gpu/YUVTexture.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { class YUVTextureEffect : public FragmentProcessor { diff --git a/tgfx/src/images/RGBAAAImage.cpp b/tgfx/src/images/RGBAAAImage.cpp index cc37cd04c9..14e9e28b88 100644 --- a/tgfx/src/images/RGBAAAImage.cpp +++ b/tgfx/src/images/RGBAAAImage.cpp @@ -18,7 +18,7 @@ #include "RGBAAAImage.h" #include "ImageSource.h" -#include "gpu/TextureEffect.h" +#include "gpu/processors/TextureEffect.h" namespace tgfx { RGBAAAImage::RGBAAAImage(std::shared_ptr source, int displayWidth, int displayHeight, diff --git a/tgfx/src/images/SubsetImage.h b/tgfx/src/images/SubsetImage.h index 05165ab489..09040271ae 100644 --- a/tgfx/src/images/SubsetImage.h +++ b/tgfx/src/images/SubsetImage.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" #include "tgfx/core/Image.h" namespace tgfx { diff --git a/tgfx/src/opengl/GLOpsRenderPass.h b/tgfx/src/opengl/GLOpsRenderPass.h index 46ddafb96b..823f71cc0f 100644 --- a/tgfx/src/opengl/GLOpsRenderPass.h +++ b/tgfx/src/opengl/GLOpsRenderPass.h @@ -22,11 +22,11 @@ #include "GLBuffer.h" #include "GLProgram.h" #include "gpu/AAType.h" -#include "gpu/FragmentProcessor.h" -#include "gpu/GeometryProcessor.h" #include "gpu/OpsRenderPass.h" #include "gpu/Pipeline.h" #include "gpu/ops/Op.h" +#include "gpu/processors/FragmentProcessor.h" +#include "gpu/processors/GeometryProcessor.h" #include "tgfx/core/BlendMode.h" namespace tgfx { diff --git a/tgfx/src/opengl/GLProgramCreator.h b/tgfx/src/opengl/GLProgramCreator.h index 67f6a9ba76..9faaca15a1 100644 --- a/tgfx/src/opengl/GLProgramCreator.h +++ b/tgfx/src/opengl/GLProgramCreator.h @@ -18,9 +18,9 @@ #pragma once -#include "gpu/GeometryProcessor.h" #include "gpu/Pipeline.h" #include "gpu/Program.h" +#include "gpu/processors/GeometryProcessor.h" namespace tgfx { class GLProgramCreator : public ProgramCreator { diff --git a/tgfx/src/opengl/GLUniformHandler.cpp b/tgfx/src/opengl/GLUniformHandler.cpp index b9c35e4b45..06ae72668c 100644 --- a/tgfx/src/opengl/GLUniformHandler.cpp +++ b/tgfx/src/opengl/GLUniformHandler.cpp @@ -124,7 +124,7 @@ std::unique_ptr GLUniformHandler::makeUniformBuffer() const { break; } if (type.has_value()) { - glUniforms.push_back({item.first, type.value(), uniform.location}); + glUniforms.push_back({item.first, *type, uniform.location}); } } return std::make_unique(glUniforms); diff --git a/tgfx/src/opengl/GLAARectEffect.cpp b/tgfx/src/opengl/processors/GLAARectEffect.cpp similarity index 98% rename from tgfx/src/opengl/GLAARectEffect.cpp rename to tgfx/src/opengl/processors/GLAARectEffect.cpp index d88207c632..62a8b2e80c 100644 --- a/tgfx/src/opengl/GLAARectEffect.cpp +++ b/tgfx/src/opengl/processors/GLAARectEffect.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLAARectEffect.h" -#include "gpu/AARectEffect.h" namespace tgfx { std::unique_ptr AARectEffect::Make(const Rect& rect) { diff --git a/tgfx/src/opengl/GLAARectEffect.h b/tgfx/src/opengl/processors/GLAARectEffect.h similarity index 96% rename from tgfx/src/opengl/GLAARectEffect.h rename to tgfx/src/opengl/processors/GLAARectEffect.h index c36695787f..4d2bf6c6b0 100644 --- a/tgfx/src/opengl/GLAARectEffect.h +++ b/tgfx/src/opengl/processors/GLAARectEffect.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/AARectEffect.h" +#include "gpu/processors/AARectEffect.h" namespace tgfx { class GLAARectEffect : public AARectEffect { diff --git a/tgfx/src/opengl/GLClampedGradientEffect.cpp b/tgfx/src/opengl/processors/GLClampedGradientEffect.cpp similarity index 98% rename from tgfx/src/opengl/GLClampedGradientEffect.cpp rename to tgfx/src/opengl/processors/GLClampedGradientEffect.cpp index a78103bcd4..6fba8b4bad 100644 --- a/tgfx/src/opengl/GLClampedGradientEffect.cpp +++ b/tgfx/src/opengl/processors/GLClampedGradientEffect.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLClampedGradientEffect.h" -#include "gpu/gradients/ClampedGradientEffect.h" namespace tgfx { std::unique_ptr ClampedGradientEffect::Make( diff --git a/tgfx/src/opengl/GLClampedGradientEffect.h b/tgfx/src/opengl/processors/GLClampedGradientEffect.h similarity index 96% rename from tgfx/src/opengl/GLClampedGradientEffect.h rename to tgfx/src/opengl/processors/GLClampedGradientEffect.h index 7fed4b9df8..3e83ff723c 100644 --- a/tgfx/src/opengl/GLClampedGradientEffect.h +++ b/tgfx/src/opengl/processors/GLClampedGradientEffect.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/gradients/ClampedGradientEffect.h" +#include "gpu/processors/ClampedGradientEffect.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/opengl/GLColorMatrixFragmentProcessor.cpp b/tgfx/src/opengl/processors/GLColorMatrixFragmentProcessor.cpp similarity index 98% rename from tgfx/src/opengl/GLColorMatrixFragmentProcessor.cpp rename to tgfx/src/opengl/processors/GLColorMatrixFragmentProcessor.cpp index 1a1bd0b780..f5253e3046 100644 --- a/tgfx/src/opengl/GLColorMatrixFragmentProcessor.cpp +++ b/tgfx/src/opengl/processors/GLColorMatrixFragmentProcessor.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLColorMatrixFragmentProcessor.h" -#include "gpu/ColorMatrixFragmentProcessor.h" namespace tgfx { std::unique_ptr ColorMatrixFragmentProcessor::Make( diff --git a/tgfx/src/opengl/GLColorMatrixFragmentProcessor.h b/tgfx/src/opengl/processors/GLColorMatrixFragmentProcessor.h similarity index 95% rename from tgfx/src/opengl/GLColorMatrixFragmentProcessor.h rename to tgfx/src/opengl/processors/GLColorMatrixFragmentProcessor.h index 9a67c93cd2..6d7d936e03 100644 --- a/tgfx/src/opengl/GLColorMatrixFragmentProcessor.h +++ b/tgfx/src/opengl/processors/GLColorMatrixFragmentProcessor.h @@ -20,7 +20,7 @@ #include #include -#include "gpu/ColorMatrixFragmentProcessor.h" +#include "gpu/processors/ColorMatrixFragmentProcessor.h" namespace tgfx { class GLColorMatrixFragmentProcessor : public ColorMatrixFragmentProcessor { diff --git a/tgfx/src/opengl/GLConstColorProcessor.cpp b/tgfx/src/opengl/processors/GLConstColorProcessor.cpp similarity index 98% rename from tgfx/src/opengl/GLConstColorProcessor.cpp rename to tgfx/src/opengl/processors/GLConstColorProcessor.cpp index 7f852917f2..0ae6b0766e 100644 --- a/tgfx/src/opengl/GLConstColorProcessor.cpp +++ b/tgfx/src/opengl/processors/GLConstColorProcessor.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLConstColorProcessor.h" -#include "gpu/ConstColorProcessor.h" namespace tgfx { std::unique_ptr ConstColorProcessor::Make(Color color, InputMode mode) { diff --git a/tgfx/src/opengl/GLConstColorProcessor.h b/tgfx/src/opengl/processors/GLConstColorProcessor.h similarity index 96% rename from tgfx/src/opengl/GLConstColorProcessor.h rename to tgfx/src/opengl/processors/GLConstColorProcessor.h index d2c296fa9f..3d84ef707d 100644 --- a/tgfx/src/opengl/GLConstColorProcessor.h +++ b/tgfx/src/opengl/processors/GLConstColorProcessor.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/ConstColorProcessor.h" +#include "gpu/processors/ConstColorProcessor.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/opengl/GLDefaultGeometryProcessor.cpp b/tgfx/src/opengl/processors/GLDefaultGeometryProcessor.cpp similarity index 98% rename from tgfx/src/opengl/GLDefaultGeometryProcessor.cpp rename to tgfx/src/opengl/processors/GLDefaultGeometryProcessor.cpp index b3bf54481a..0b2d54a465 100644 --- a/tgfx/src/opengl/GLDefaultGeometryProcessor.cpp +++ b/tgfx/src/opengl/processors/GLDefaultGeometryProcessor.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLDefaultGeometryProcessor.h" -#include "gpu/DefaultGeometryProcessor.h" namespace tgfx { std::unique_ptr DefaultGeometryProcessor::Make( diff --git a/tgfx/src/opengl/GLDefaultGeometryProcessor.h b/tgfx/src/opengl/processors/GLDefaultGeometryProcessor.h similarity index 96% rename from tgfx/src/opengl/GLDefaultGeometryProcessor.h rename to tgfx/src/opengl/processors/GLDefaultGeometryProcessor.h index c4ed934564..50d634c8e6 100644 --- a/tgfx/src/opengl/GLDefaultGeometryProcessor.h +++ b/tgfx/src/opengl/processors/GLDefaultGeometryProcessor.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/DefaultGeometryProcessor.h" +#include "gpu/processors/DefaultGeometryProcessor.h" namespace tgfx { class GLDefaultGeometryProcessor : public DefaultGeometryProcessor { diff --git a/tgfx/src/opengl/GLDeviceSpaceTextureEffect.cpp b/tgfx/src/opengl/processors/GLDeviceSpaceTextureEffect.cpp similarity index 98% rename from tgfx/src/opengl/GLDeviceSpaceTextureEffect.cpp rename to tgfx/src/opengl/processors/GLDeviceSpaceTextureEffect.cpp index ed670af04a..c4c7ac0f98 100644 --- a/tgfx/src/opengl/GLDeviceSpaceTextureEffect.cpp +++ b/tgfx/src/opengl/processors/GLDeviceSpaceTextureEffect.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLDeviceSpaceTextureEffect.h" -#include "gpu/DeviceSpaceTextureEffect.h" namespace tgfx { std::unique_ptr DeviceSpaceTextureEffect::Make( diff --git a/tgfx/src/opengl/GLDeviceSpaceTextureEffect.h b/tgfx/src/opengl/processors/GLDeviceSpaceTextureEffect.h similarity index 96% rename from tgfx/src/opengl/GLDeviceSpaceTextureEffect.h rename to tgfx/src/opengl/processors/GLDeviceSpaceTextureEffect.h index 0cb020bf08..90dc0f1384 100644 --- a/tgfx/src/opengl/GLDeviceSpaceTextureEffect.h +++ b/tgfx/src/opengl/processors/GLDeviceSpaceTextureEffect.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/DeviceSpaceTextureEffect.h" +#include "gpu/processors/DeviceSpaceTextureEffect.h" namespace tgfx { class GLDeviceSpaceTextureEffect : public DeviceSpaceTextureEffect { diff --git a/tgfx/src/opengl/GLDualBlurFragmentProcessor.cpp b/tgfx/src/opengl/processors/GLDualBlurFragmentProcessor.cpp similarity index 99% rename from tgfx/src/opengl/GLDualBlurFragmentProcessor.cpp rename to tgfx/src/opengl/processors/GLDualBlurFragmentProcessor.cpp index 6b8bff512e..f57acc7e13 100644 --- a/tgfx/src/opengl/GLDualBlurFragmentProcessor.cpp +++ b/tgfx/src/opengl/processors/GLDualBlurFragmentProcessor.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLDualBlurFragmentProcessor.h" -#include "gpu/DualBlurFragmentProcessor.h" namespace tgfx { std::unique_ptr DualBlurFragmentProcessor::Make( diff --git a/tgfx/src/opengl/GLDualBlurFragmentProcessor.h b/tgfx/src/opengl/processors/GLDualBlurFragmentProcessor.h similarity index 96% rename from tgfx/src/opengl/GLDualBlurFragmentProcessor.h rename to tgfx/src/opengl/processors/GLDualBlurFragmentProcessor.h index 7174d21909..832610ca24 100644 --- a/tgfx/src/opengl/GLDualBlurFragmentProcessor.h +++ b/tgfx/src/opengl/processors/GLDualBlurFragmentProcessor.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/DualBlurFragmentProcessor.h" +#include "gpu/processors/DualBlurFragmentProcessor.h" namespace tgfx { class GLDualBlurFragmentProcessor : public DualBlurFragmentProcessor { diff --git a/tgfx/src/opengl/GLDualIntervalGradientColorizer.cpp b/tgfx/src/opengl/processors/GLDualIntervalGradientColorizer.cpp similarity index 98% rename from tgfx/src/opengl/GLDualIntervalGradientColorizer.cpp rename to tgfx/src/opengl/processors/GLDualIntervalGradientColorizer.cpp index 76db2439e6..6d827ca6e5 100644 --- a/tgfx/src/opengl/GLDualIntervalGradientColorizer.cpp +++ b/tgfx/src/opengl/processors/GLDualIntervalGradientColorizer.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLDualIntervalGradientColorizer.h" -#include "gpu/gradients/DualIntervalGradientColorizer.h" namespace tgfx { std::unique_ptr DualIntervalGradientColorizer::Make( diff --git a/tgfx/src/opengl/GLDualIntervalGradientColorizer.h b/tgfx/src/opengl/processors/GLDualIntervalGradientColorizer.h similarity index 95% rename from tgfx/src/opengl/GLDualIntervalGradientColorizer.h rename to tgfx/src/opengl/processors/GLDualIntervalGradientColorizer.h index 4d6cfd72ed..c65fb29e72 100644 --- a/tgfx/src/opengl/GLDualIntervalGradientColorizer.h +++ b/tgfx/src/opengl/processors/GLDualIntervalGradientColorizer.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/gradients/DualIntervalGradientColorizer.h" +#include "gpu/processors/DualIntervalGradientColorizer.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/opengl/GLEllipseGeometryProcessor.cpp b/tgfx/src/opengl/processors/GLEllipseGeometryProcessor.cpp similarity index 99% rename from tgfx/src/opengl/GLEllipseGeometryProcessor.cpp rename to tgfx/src/opengl/processors/GLEllipseGeometryProcessor.cpp index 72e1c4b5e2..498c41fbe0 100644 --- a/tgfx/src/opengl/GLEllipseGeometryProcessor.cpp +++ b/tgfx/src/opengl/processors/GLEllipseGeometryProcessor.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLEllipseGeometryProcessor.h" -#include "gpu/EllipseGeometryProcessor.h" namespace tgfx { std::unique_ptr EllipseGeometryProcessor::Make( diff --git a/tgfx/src/opengl/GLEllipseGeometryProcessor.h b/tgfx/src/opengl/processors/GLEllipseGeometryProcessor.h similarity index 96% rename from tgfx/src/opengl/GLEllipseGeometryProcessor.h rename to tgfx/src/opengl/processors/GLEllipseGeometryProcessor.h index 81caca9ec1..147355c60f 100644 --- a/tgfx/src/opengl/GLEllipseGeometryProcessor.h +++ b/tgfx/src/opengl/processors/GLEllipseGeometryProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/EllipseGeometryProcessor.h" +#include "gpu/processors/EllipseGeometryProcessor.h" namespace tgfx { class GLEllipseGeometryProcessor : public EllipseGeometryProcessor { diff --git a/tgfx/src/opengl/GLEmptyXferProcessor.cpp b/tgfx/src/opengl/processors/GLEmptyXferProcessor.cpp similarity index 100% rename from tgfx/src/opengl/GLEmptyXferProcessor.cpp rename to tgfx/src/opengl/processors/GLEmptyXferProcessor.cpp diff --git a/tgfx/src/opengl/GLEmptyXferProcessor.h b/tgfx/src/opengl/processors/GLEmptyXferProcessor.h similarity index 95% rename from tgfx/src/opengl/GLEmptyXferProcessor.h rename to tgfx/src/opengl/processors/GLEmptyXferProcessor.h index c73d0dddac..89a1ef98f6 100644 --- a/tgfx/src/opengl/GLEmptyXferProcessor.h +++ b/tgfx/src/opengl/processors/GLEmptyXferProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/EmptyXferProcessor.h" +#include "gpu/processors/EmptyXferProcessor.h" namespace tgfx { class GLEmptyXferProcessor : public EmptyXferProcessor { diff --git a/tgfx/src/opengl/GLLinearGradientLayout.cpp b/tgfx/src/opengl/processors/GLLinearGradientLayout.cpp similarity index 100% rename from tgfx/src/opengl/GLLinearGradientLayout.cpp rename to tgfx/src/opengl/processors/GLLinearGradientLayout.cpp diff --git a/tgfx/src/opengl/GLLinearGradientLayout.h b/tgfx/src/opengl/processors/GLLinearGradientLayout.h similarity index 95% rename from tgfx/src/opengl/GLLinearGradientLayout.h rename to tgfx/src/opengl/processors/GLLinearGradientLayout.h index f796aaf860..ef3af7e9d9 100644 --- a/tgfx/src/opengl/GLLinearGradientLayout.h +++ b/tgfx/src/opengl/processors/GLLinearGradientLayout.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/gradients/LinearGradientLayout.h" +#include "gpu/processors/LinearGradientLayout.h" namespace tgfx { class GLLinearGradientLayout : public LinearGradientLayout { diff --git a/tgfx/src/opengl/GLLumaColorFilterEffect.cpp b/tgfx/src/opengl/processors/GLLumaColorFilterEffect.cpp similarity index 100% rename from tgfx/src/opengl/GLLumaColorFilterEffect.cpp rename to tgfx/src/opengl/processors/GLLumaColorFilterEffect.cpp diff --git a/tgfx/src/opengl/GLLumaColorFilterEffect.h b/tgfx/src/opengl/processors/GLLumaColorFilterEffect.h similarity index 95% rename from tgfx/src/opengl/GLLumaColorFilterEffect.h rename to tgfx/src/opengl/processors/GLLumaColorFilterEffect.h index 6ebd2e50d3..9067e20678 100644 --- a/tgfx/src/opengl/GLLumaColorFilterEffect.h +++ b/tgfx/src/opengl/processors/GLLumaColorFilterEffect.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/LumaColorFilterEffect.h" +#include "gpu/processors/LumaColorFilterEffect.h" namespace tgfx { class GLLumaColorFilterEffect : public LumaColorFilterEffect { diff --git a/tgfx/src/opengl/GLPorterDuffXferProcessor.cpp b/tgfx/src/opengl/processors/GLPorterDuffXferProcessor.cpp similarity index 98% rename from tgfx/src/opengl/GLPorterDuffXferProcessor.cpp rename to tgfx/src/opengl/processors/GLPorterDuffXferProcessor.cpp index e544fededd..774e56419a 100644 --- a/tgfx/src/opengl/GLPorterDuffXferProcessor.cpp +++ b/tgfx/src/opengl/processors/GLPorterDuffXferProcessor.cpp @@ -17,8 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLPorterDuffXferProcessor.h" -#include "GLBlend.h" -#include "gpu/PorterDuffXferProcessor.h" +#include "opengl/GLBlend.h" namespace tgfx { std::unique_ptr PorterDuffXferProcessor::Make(BlendMode blend) { diff --git a/tgfx/src/opengl/GLPorterDuffXferProcessor.h b/tgfx/src/opengl/processors/GLPorterDuffXferProcessor.h similarity index 96% rename from tgfx/src/opengl/GLPorterDuffXferProcessor.h rename to tgfx/src/opengl/processors/GLPorterDuffXferProcessor.h index 15ce539f54..3c9c7f3a64 100644 --- a/tgfx/src/opengl/GLPorterDuffXferProcessor.h +++ b/tgfx/src/opengl/processors/GLPorterDuffXferProcessor.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/PorterDuffXferProcessor.h" +#include "gpu/processors/PorterDuffXferProcessor.h" namespace tgfx { class GLPorterDuffXferProcessor : public PorterDuffXferProcessor { diff --git a/tgfx/src/opengl/GLQuadPerEdgeAAGeometryProcessor.cpp b/tgfx/src/opengl/processors/GLQuadPerEdgeAAGeometryProcessor.cpp similarity index 98% rename from tgfx/src/opengl/GLQuadPerEdgeAAGeometryProcessor.cpp rename to tgfx/src/opengl/processors/GLQuadPerEdgeAAGeometryProcessor.cpp index e2b1163f60..f6cc30fce4 100644 --- a/tgfx/src/opengl/GLQuadPerEdgeAAGeometryProcessor.cpp +++ b/tgfx/src/opengl/processors/GLQuadPerEdgeAAGeometryProcessor.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLQuadPerEdgeAAGeometryProcessor.h" -#include "gpu/QuadPerEdgeAAGeometryProcessor.h" namespace tgfx { std::unique_ptr QuadPerEdgeAAGeometryProcessor::Make( diff --git a/tgfx/src/opengl/GLQuadPerEdgeAAGeometryProcessor.h b/tgfx/src/opengl/processors/GLQuadPerEdgeAAGeometryProcessor.h similarity index 95% rename from tgfx/src/opengl/GLQuadPerEdgeAAGeometryProcessor.h rename to tgfx/src/opengl/processors/GLQuadPerEdgeAAGeometryProcessor.h index 9fc95f431d..fca2882c64 100644 --- a/tgfx/src/opengl/GLQuadPerEdgeAAGeometryProcessor.h +++ b/tgfx/src/opengl/processors/GLQuadPerEdgeAAGeometryProcessor.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/QuadPerEdgeAAGeometryProcessor.h" +#include "gpu/processors/QuadPerEdgeAAGeometryProcessor.h" namespace tgfx { class GLQuadPerEdgeAAGeometryProcessor : public QuadPerEdgeAAGeometryProcessor { diff --git a/tgfx/src/opengl/GLRadialGradientLayout.cpp b/tgfx/src/opengl/processors/GLRadialGradientLayout.cpp similarity index 100% rename from tgfx/src/opengl/GLRadialGradientLayout.cpp rename to tgfx/src/opengl/processors/GLRadialGradientLayout.cpp diff --git a/tgfx/src/opengl/GLRadialGradientLayout.h b/tgfx/src/opengl/processors/GLRadialGradientLayout.h similarity index 95% rename from tgfx/src/opengl/GLRadialGradientLayout.h rename to tgfx/src/opengl/processors/GLRadialGradientLayout.h index f7adaac46f..b2f92c5feb 100644 --- a/tgfx/src/opengl/GLRadialGradientLayout.h +++ b/tgfx/src/opengl/processors/GLRadialGradientLayout.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/gradients/RadialGradientLayout.h" +#include "gpu/processors/RadialGradientLayout.h" namespace tgfx { class GLRadialGradientLayout : public RadialGradientLayout { diff --git a/tgfx/src/opengl/GLSeriesFragmentProcessor.cpp b/tgfx/src/opengl/processors/GLSeriesFragmentProcessor.cpp similarity index 100% rename from tgfx/src/opengl/GLSeriesFragmentProcessor.cpp rename to tgfx/src/opengl/processors/GLSeriesFragmentProcessor.cpp diff --git a/tgfx/src/opengl/GLSeriesFragmentProcessor.h b/tgfx/src/opengl/processors/GLSeriesFragmentProcessor.h similarity index 95% rename from tgfx/src/opengl/GLSeriesFragmentProcessor.h rename to tgfx/src/opengl/processors/GLSeriesFragmentProcessor.h index 0cc5d0002a..b4a6a31c38 100644 --- a/tgfx/src/opengl/GLSeriesFragmentProcessor.h +++ b/tgfx/src/opengl/processors/GLSeriesFragmentProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/SeriesFragmentProcessor.h" +#include "gpu/processors/SeriesFragmentProcessor.h" namespace tgfx { class GLSeriesFragmentProcessor : public SeriesFragmentProcessor { diff --git a/tgfx/src/opengl/GLSingleIntervalGradientColorizer.cpp b/tgfx/src/opengl/processors/GLSingleIntervalGradientColorizer.cpp similarity index 97% rename from tgfx/src/opengl/GLSingleIntervalGradientColorizer.cpp rename to tgfx/src/opengl/processors/GLSingleIntervalGradientColorizer.cpp index f20e24a328..0e629118a2 100644 --- a/tgfx/src/opengl/GLSingleIntervalGradientColorizer.cpp +++ b/tgfx/src/opengl/processors/GLSingleIntervalGradientColorizer.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLSingleIntervalGradientColorizer.h" -#include "gpu/gradients/SingleIntervalGradientColorizer.h" namespace tgfx { std::unique_ptr SingleIntervalGradientColorizer::Make(Color start, diff --git a/tgfx/src/opengl/GLSingleIntervalGradientColorizer.h b/tgfx/src/opengl/processors/GLSingleIntervalGradientColorizer.h similarity index 95% rename from tgfx/src/opengl/GLSingleIntervalGradientColorizer.h rename to tgfx/src/opengl/processors/GLSingleIntervalGradientColorizer.h index 86f8bd569c..4f00f9e079 100644 --- a/tgfx/src/opengl/GLSingleIntervalGradientColorizer.h +++ b/tgfx/src/opengl/processors/GLSingleIntervalGradientColorizer.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/gradients/SingleIntervalGradientColorizer.h" +#include "gpu/processors/SingleIntervalGradientColorizer.h" #include "tgfx/core/Color.h" namespace tgfx { diff --git a/tgfx/src/opengl/GLSweepGradientLayout.cpp b/tgfx/src/opengl/processors/GLSweepGradientLayout.cpp similarity index 98% rename from tgfx/src/opengl/GLSweepGradientLayout.cpp rename to tgfx/src/opengl/processors/GLSweepGradientLayout.cpp index c3644eb354..f3d5e0ebdb 100644 --- a/tgfx/src/opengl/GLSweepGradientLayout.cpp +++ b/tgfx/src/opengl/processors/GLSweepGradientLayout.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLSweepGradientLayout.h" -#include "gpu/gradients/SweepGradientLayout.h" namespace tgfx { std::unique_ptr SweepGradientLayout::Make(Matrix matrix, float bias, diff --git a/tgfx/src/opengl/GLSweepGradientLayout.h b/tgfx/src/opengl/processors/GLSweepGradientLayout.h similarity index 96% rename from tgfx/src/opengl/GLSweepGradientLayout.h rename to tgfx/src/opengl/processors/GLSweepGradientLayout.h index 46fa7b76c5..02bd04ec24 100644 --- a/tgfx/src/opengl/GLSweepGradientLayout.h +++ b/tgfx/src/opengl/processors/GLSweepGradientLayout.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/gradients/SweepGradientLayout.h" +#include "gpu/processors/SweepGradientLayout.h" namespace tgfx { class GLSweepGradientLayout : public SweepGradientLayout { diff --git a/tgfx/src/opengl/GLTextureEffect.cpp b/tgfx/src/opengl/processors/GLTextureEffect.cpp similarity index 98% rename from tgfx/src/opengl/GLTextureEffect.cpp rename to tgfx/src/opengl/processors/GLTextureEffect.cpp index 37a109424f..b8f59c0837 100644 --- a/tgfx/src/opengl/GLTextureEffect.cpp +++ b/tgfx/src/opengl/processors/GLTextureEffect.cpp @@ -17,8 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLTextureEffect.h" -#include "gpu/TextureEffect.h" -#include "opengl/GLYUVTextureEffect.h" +#include "opengl/processors/GLYUVTextureEffect.h" namespace tgfx { std::unique_ptr TextureEffect::Make(std::shared_ptr texture, diff --git a/tgfx/src/opengl/GLTextureEffect.h b/tgfx/src/opengl/processors/GLTextureEffect.h similarity index 96% rename from tgfx/src/opengl/GLTextureEffect.h rename to tgfx/src/opengl/processors/GLTextureEffect.h index f29d12355e..dc0395ae3c 100644 --- a/tgfx/src/opengl/GLTextureEffect.h +++ b/tgfx/src/opengl/processors/GLTextureEffect.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/TextureEffect.h" +#include "gpu/processors/TextureEffect.h" namespace tgfx { class GLTextureEffect : public TextureEffect { diff --git a/tgfx/src/opengl/GLTextureGradientColorizer.cpp b/tgfx/src/opengl/processors/GLTextureGradientColorizer.cpp similarity index 100% rename from tgfx/src/opengl/GLTextureGradientColorizer.cpp rename to tgfx/src/opengl/processors/GLTextureGradientColorizer.cpp diff --git a/tgfx/src/opengl/GLTextureGradientColorizer.h b/tgfx/src/opengl/processors/GLTextureGradientColorizer.h similarity index 95% rename from tgfx/src/opengl/GLTextureGradientColorizer.h rename to tgfx/src/opengl/processors/GLTextureGradientColorizer.h index 530d8b40fa..a4cfd16277 100644 --- a/tgfx/src/opengl/GLTextureGradientColorizer.h +++ b/tgfx/src/opengl/processors/GLTextureGradientColorizer.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/gradients/TextureGradientColorizer.h" +#include "gpu/processors/TextureGradientColorizer.h" namespace tgfx { class GLTextureGradientColorizer : public TextureGradientColorizer { diff --git a/tgfx/src/opengl/GLTiledTextureEffect.cpp b/tgfx/src/opengl/processors/GLTiledTextureEffect.cpp similarity index 99% rename from tgfx/src/opengl/GLTiledTextureEffect.cpp rename to tgfx/src/opengl/processors/GLTiledTextureEffect.cpp index cfcddcc45c..27c321c8c4 100644 --- a/tgfx/src/opengl/GLTiledTextureEffect.cpp +++ b/tgfx/src/opengl/processors/GLTiledTextureEffect.cpp @@ -18,7 +18,6 @@ #include "GLTiledTextureEffect.h" #include "gpu/SamplerState.h" -#include "gpu/TiledTextureEffect.h" namespace tgfx { std::unique_ptr TiledTextureEffect::Make(std::shared_ptr texture, diff --git a/tgfx/src/opengl/GLTiledTextureEffect.h b/tgfx/src/opengl/processors/GLTiledTextureEffect.h similarity index 98% rename from tgfx/src/opengl/GLTiledTextureEffect.h rename to tgfx/src/opengl/processors/GLTiledTextureEffect.h index 0ab622c8c4..5968da1669 100644 --- a/tgfx/src/opengl/GLTiledTextureEffect.h +++ b/tgfx/src/opengl/processors/GLTiledTextureEffect.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/TiledTextureEffect.h" +#include "gpu/processors/TiledTextureEffect.h" namespace tgfx { class GLTiledTextureEffect : public TiledTextureEffect { diff --git a/tgfx/src/opengl/GLUnrolledBinaryGradientColorizer.cpp b/tgfx/src/opengl/processors/GLUnrolledBinaryGradientColorizer.cpp similarity index 99% rename from tgfx/src/opengl/GLUnrolledBinaryGradientColorizer.cpp rename to tgfx/src/opengl/processors/GLUnrolledBinaryGradientColorizer.cpp index d45a9d8fc1..fa425c352f 100644 --- a/tgfx/src/opengl/GLUnrolledBinaryGradientColorizer.cpp +++ b/tgfx/src/opengl/processors/GLUnrolledBinaryGradientColorizer.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLUnrolledBinaryGradientColorizer.h" -#include "gpu/gradients/UnrolledBinaryGradientColorizer.h" #include "utils/MathExtra.h" namespace tgfx { diff --git a/tgfx/src/opengl/GLUnrolledBinaryGradientColorizer.h b/tgfx/src/opengl/processors/GLUnrolledBinaryGradientColorizer.h similarity index 97% rename from tgfx/src/opengl/GLUnrolledBinaryGradientColorizer.h rename to tgfx/src/opengl/processors/GLUnrolledBinaryGradientColorizer.h index 25230ce13f..5ac134b750 100644 --- a/tgfx/src/opengl/GLUnrolledBinaryGradientColorizer.h +++ b/tgfx/src/opengl/processors/GLUnrolledBinaryGradientColorizer.h @@ -19,7 +19,7 @@ #pragma once #include -#include "gpu/gradients/UnrolledBinaryGradientColorizer.h" +#include "gpu/processors/UnrolledBinaryGradientColorizer.h" namespace tgfx { /** diff --git a/tgfx/src/opengl/GLXfermodeFragmentProcessor.cpp b/tgfx/src/opengl/processors/GLXfermodeFragmentProcessor.cpp similarity index 97% rename from tgfx/src/opengl/GLXfermodeFragmentProcessor.cpp rename to tgfx/src/opengl/processors/GLXfermodeFragmentProcessor.cpp index 29d68373ab..7654af0333 100644 --- a/tgfx/src/opengl/GLXfermodeFragmentProcessor.cpp +++ b/tgfx/src/opengl/processors/GLXfermodeFragmentProcessor.cpp @@ -17,9 +17,8 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLXfermodeFragmentProcessor.h" -#include "GLBlend.h" -#include "gpu/ConstColorProcessor.h" -#include "gpu/XfermodeFragmentProcessor.h" +#include "gpu/processors/ConstColorProcessor.h" +#include "opengl/GLBlend.h" namespace tgfx { std::unique_ptr XfermodeFragmentProcessor::MakeFromTwoProcessors( diff --git a/tgfx/src/opengl/GLXfermodeFragmentProcessor.h b/tgfx/src/opengl/processors/GLXfermodeFragmentProcessor.h similarity index 95% rename from tgfx/src/opengl/GLXfermodeFragmentProcessor.h rename to tgfx/src/opengl/processors/GLXfermodeFragmentProcessor.h index b4f19aefbe..1823d44a00 100644 --- a/tgfx/src/opengl/GLXfermodeFragmentProcessor.h +++ b/tgfx/src/opengl/processors/GLXfermodeFragmentProcessor.h @@ -18,7 +18,7 @@ #pragma once -#include "gpu/XfermodeFragmentProcessor.h" +#include "gpu/processors/XfermodeFragmentProcessor.h" namespace tgfx { class GLXfermodeFragmentProcessor : public XfermodeFragmentProcessor { diff --git a/tgfx/src/opengl/GLYUVTextureEffect.cpp b/tgfx/src/opengl/processors/GLYUVTextureEffect.cpp similarity index 99% rename from tgfx/src/opengl/GLYUVTextureEffect.cpp rename to tgfx/src/opengl/processors/GLYUVTextureEffect.cpp index 3703f2f64f..c117547f34 100644 --- a/tgfx/src/opengl/GLYUVTextureEffect.cpp +++ b/tgfx/src/opengl/processors/GLYUVTextureEffect.cpp @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "GLYUVTextureEffect.h" -#include "gpu/YUVTextureEffect.h" namespace tgfx { GLYUVTextureEffect::GLYUVTextureEffect(std::shared_ptr texture, diff --git a/tgfx/src/opengl/GLYUVTextureEffect.h b/tgfx/src/opengl/processors/GLYUVTextureEffect.h similarity index 96% rename from tgfx/src/opengl/GLYUVTextureEffect.h rename to tgfx/src/opengl/processors/GLYUVTextureEffect.h index 1e7ff82c44..397a77751d 100644 --- a/tgfx/src/opengl/GLYUVTextureEffect.h +++ b/tgfx/src/opengl/processors/GLYUVTextureEffect.h @@ -20,7 +20,7 @@ #include #include "gpu/YUVTexture.h" -#include "gpu/YUVTextureEffect.h" +#include "gpu/processors/YUVTextureEffect.h" namespace tgfx { class GLYUVTextureEffect : public YUVTextureEffect { diff --git a/tgfx/src/shaders/ColorFilterShader.cpp b/tgfx/src/shaders/ColorFilterShader.cpp index de1fe7276b..800167fd16 100644 --- a/tgfx/src/shaders/ColorFilterShader.cpp +++ b/tgfx/src/shaders/ColorFilterShader.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "ColorFilterShader.h" -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { std::shared_ptr Shader::makeWithColorFilter( diff --git a/tgfx/src/shaders/ColorShader.cpp b/tgfx/src/shaders/ColorShader.cpp index 642cc29c7a..3727110d90 100644 --- a/tgfx/src/shaders/ColorShader.cpp +++ b/tgfx/src/shaders/ColorShader.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "ColorShader.h" -#include "gpu/ConstColorProcessor.h" +#include "gpu/processors/ConstColorProcessor.h" namespace tgfx { std::shared_ptr Shader::MakeColorShader(Color color) { diff --git a/tgfx/src/shaders/GradientShader.cpp b/tgfx/src/shaders/GradientShader.cpp index e0262b7b99..f6c915447b 100644 --- a/tgfx/src/shaders/GradientShader.cpp +++ b/tgfx/src/shaders/GradientShader.cpp @@ -18,14 +18,14 @@ #include "GradientShader.h" #include "gpu/ResourceProvider.h" -#include "gpu/gradients/ClampedGradientEffect.h" -#include "gpu/gradients/DualIntervalGradientColorizer.h" -#include "gpu/gradients/LinearGradientLayout.h" -#include "gpu/gradients/RadialGradientLayout.h" -#include "gpu/gradients/SingleIntervalGradientColorizer.h" -#include "gpu/gradients/SweepGradientLayout.h" -#include "gpu/gradients/TextureGradientColorizer.h" -#include "gpu/gradients/UnrolledBinaryGradientColorizer.h" +#include "gpu/processors/ClampedGradientEffect.h" +#include "gpu/processors/DualIntervalGradientColorizer.h" +#include "gpu/processors/LinearGradientLayout.h" +#include "gpu/processors/RadialGradientLayout.h" +#include "gpu/processors/SingleIntervalGradientColorizer.h" +#include "gpu/processors/SweepGradientLayout.h" +#include "gpu/processors/TextureGradientColorizer.h" +#include "gpu/processors/UnrolledBinaryGradientColorizer.h" #include "utils/MathExtra.h" namespace tgfx { diff --git a/tgfx/src/shaders/ImageShader.cpp b/tgfx/src/shaders/ImageShader.cpp index 8e3d8c0504..de09bc6fb5 100644 --- a/tgfx/src/shaders/ImageShader.cpp +++ b/tgfx/src/shaders/ImageShader.cpp @@ -18,7 +18,7 @@ #include "ImageShader.h" #include "gpu/TextureSampler.h" -#include "gpu/TiledTextureEffect.h" +#include "gpu/processors/TiledTextureEffect.h" #include "images/ImageSource.h" namespace tgfx { diff --git a/tgfx/src/shaders/LocalMatrixShader.cpp b/tgfx/src/shaders/LocalMatrixShader.cpp index 080b970c9d..a273c92d8b 100644 --- a/tgfx/src/shaders/LocalMatrixShader.cpp +++ b/tgfx/src/shaders/LocalMatrixShader.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "LocalMatrixShader.h" -#include "gpu/FragmentProcessor.h" +#include "gpu/processors/FragmentProcessor.h" namespace tgfx { std::shared_ptr Shader::makeWithLocalMatrix(const Matrix& matrix, bool isPre) const { diff --git a/tgfx/src/shapes/TextureShape.cpp b/tgfx/src/shapes/TextureShape.cpp index 2a06b0ebab..6959e09085 100644 --- a/tgfx/src/shapes/TextureShape.cpp +++ b/tgfx/src/shapes/TextureShape.cpp @@ -17,8 +17,8 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #include "TextureShape.h" -#include "gpu/TextureEffect.h" #include "gpu/ops/FillRectOp.h" +#include "gpu/processors/TextureEffect.h" #include "tgfx/core/Mask.h" namespace tgfx {