aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gn/gpu.gni1
-rw-r--r--src/effects/GrAlphaThresholdFragmentProcessor.h1
-rw-r--r--src/effects/GrCircleBlurFragmentProcessor.h1
-rw-r--r--src/effects/SkMagnifierImageFilter.cpp1
-rw-r--r--src/effects/SkMorphologyImageFilter.cpp1
-rw-r--r--src/gpu/effects/GrBicubicEffect.cpp2
-rw-r--r--src/gpu/effects/GrBlurredEdgeFragmentProcessor.h1
-rw-r--r--src/gpu/effects/GrCircleEffect.h1
-rw-r--r--src/gpu/effects/GrDitherEffect.h1
-rw-r--r--src/gpu/effects/GrEllipseEffect.h1
-rw-r--r--src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp1
-rw-r--r--src/gpu/effects/GrProxyMove.h39
-rw-r--r--src/gpu/effects/GrSimpleTextureEffect.h1
-rw-r--r--src/sksl/SkSLHCodeGenerator.cpp3
-rw-r--r--tests/SkSLFPTest.cpp1
15 files changed, 1 insertions, 55 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni
index f767100794..a2b1d0091b 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -341,7 +341,6 @@ skia_gpu_sources = [
"$_src/gpu/effects/GrOvalEffect.h",
"$_src/gpu/effects/GrPorterDuffXferProcessor.cpp",
"$_src/gpu/effects/GrPorterDuffXferProcessor.h",
- "$_src/gpu/effects/GrProxyMove.h",
"$_src/gpu/effects/GrRRectEffect.cpp",
"$_src/gpu/effects/GrRRectEffect.h",
"$_src/gpu/effects/GrShadowGeoProc.cpp",
diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.h b/src/effects/GrAlphaThresholdFragmentProcessor.h
index 3bc42a7ddd..e2b10e8cb7 100644
--- a/src/effects/GrAlphaThresholdFragmentProcessor.h
+++ b/src/effects/GrAlphaThresholdFragmentProcessor.h
@@ -17,7 +17,6 @@
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
#include "GrColorSpaceXform.h"
-#include "effects/GrProxyMove.h"
class GrAlphaThresholdFragmentProcessor : public GrFragmentProcessor {
public:
inline OptimizationFlags optFlags(float outerThreshold);
diff --git a/src/effects/GrCircleBlurFragmentProcessor.h b/src/effects/GrCircleBlurFragmentProcessor.h
index 354928d49e..4a450d7a66 100644
--- a/src/effects/GrCircleBlurFragmentProcessor.h
+++ b/src/effects/GrCircleBlurFragmentProcessor.h
@@ -15,7 +15,6 @@
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
#include "GrColorSpaceXform.h"
-#include "effects/GrProxyMove.h"
class GrCircleBlurFragmentProcessor : public GrFragmentProcessor {
public:
SkRect circleRect() const { return fCircleRect; }
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index 558e49071c..7c7c12590b 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -21,7 +21,6 @@
#include "GrContext.h"
#include "GrCoordTransform.h"
#include "GrTexture.h"
-#include "effects/GrProxyMove.h"
#include "glsl/GrGLSLColorSpaceXformHelper.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index 62c7c2e3b4..9bc1d7660f 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -25,7 +25,6 @@
#include "GrTexture.h"
#include "GrTextureProxy.h"
#include "SkGr.h"
-#include "effects/GrProxyMove.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp
index 9472f5192e..dc608c5c9f 100644
--- a/src/gpu/effects/GrBicubicEffect.cpp
+++ b/src/gpu/effects/GrBicubicEffect.cpp
@@ -7,9 +7,7 @@
#include "GrBicubicEffect.h"
-#include "GrProxyMove.h"
#include "GrTexture.h"
-#include "GrTextureProxy.h"
#include "glsl/GrGLSLColorSpaceXformHelper.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
diff --git a/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h b/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h
index 0875d88f8c..733fd8342c 100644
--- a/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h
+++ b/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h
@@ -15,7 +15,6 @@
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
#include "GrColorSpaceXform.h"
-#include "effects/GrProxyMove.h"
class GrBlurredEdgeFragmentProcessor : public GrFragmentProcessor {
public:
enum Mode { kGaussian_Mode = 0, kSmoothStep_Mode = 1 };
diff --git a/src/gpu/effects/GrCircleEffect.h b/src/gpu/effects/GrCircleEffect.h
index 00f98d416e..fae8155389 100644
--- a/src/gpu/effects/GrCircleEffect.h
+++ b/src/gpu/effects/GrCircleEffect.h
@@ -15,7 +15,6 @@
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
#include "GrColorSpaceXform.h"
-#include "effects/GrProxyMove.h"
class GrCircleEffect : public GrFragmentProcessor {
public:
int edgeType() const { return fEdgeType; }
diff --git a/src/gpu/effects/GrDitherEffect.h b/src/gpu/effects/GrDitherEffect.h
index 62c97d5bf7..d3a4e86486 100644
--- a/src/gpu/effects/GrDitherEffect.h
+++ b/src/gpu/effects/GrDitherEffect.h
@@ -15,7 +15,6 @@
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
#include "GrColorSpaceXform.h"
-#include "effects/GrProxyMove.h"
class GrDitherEffect : public GrFragmentProcessor {
public:
int rangeType() const { return fRangeType; }
diff --git a/src/gpu/effects/GrEllipseEffect.h b/src/gpu/effects/GrEllipseEffect.h
index 02efb6761d..980ba533be 100644
--- a/src/gpu/effects/GrEllipseEffect.h
+++ b/src/gpu/effects/GrEllipseEffect.h
@@ -15,7 +15,6 @@
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
#include "GrColorSpaceXform.h"
-#include "effects/GrProxyMove.h"
class GrEllipseEffect : public GrFragmentProcessor {
public:
int edgeType() const { return fEdgeType; }
diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
index 423b25dc0f..6d51cf9ed1 100644
--- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
+++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
@@ -7,7 +7,6 @@
#include "GrGaussianConvolutionFragmentProcessor.h"
-#include "GrProxyMove.h"
#include "GrTexture.h"
#include "GrTextureProxy.h"
#include "../private/GrGLSL.h"
diff --git a/src/gpu/effects/GrProxyMove.h b/src/gpu/effects/GrProxyMove.h
deleted file mode 100644
index 4fbf1a008d..0000000000
--- a/src/gpu/effects/GrProxyMove.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrProxyMove_DEFINED
-#define GrProxyMove_DEFINED
-
-// In a few places below we rely on braced initialization order being defined by the C++ spec (left
-// to right). We use operator-> on a sk_sp and then in a later argument std::move() the sk_sp. GCC
-// 4.9.0 and earlier has a bug where the left to right order evaluation isn't implemented correctly.
-//
-// Clang has the same bug when targeting Windows (http://crbug.com/687259).
-// TODO(hans): Remove work-around once Clang is fixed.
-#if defined(__GNUC__) && !defined(__clang__)
-# define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-# if (GCC_VERSION > 40900)
-# define GCC_EVAL_ORDER_BUG 0
-# else
-# define GCC_EVAL_ORDER_BUG 1
-# endif
-# undef GCC_VERSION
-#elif defined(_MSC_VER) && defined(__clang__)
-# define GCC_EVAL_ORDER_BUG 1
-#else
-# define GCC_EVAL_ORDER_BUG 0
-#endif
-
-#if GCC_EVAL_ORDER_BUG
-# define GR_PROXY_MOVE(X) (X)
-#else
-# define GR_PROXY_MOVE(X) (std::move(X))
-#endif
-
-#undef GCC_EVAL_ORDER_BUG
-
-#endif
diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h
index af85ff1d3c..41d7af772c 100644
--- a/src/gpu/effects/GrSimpleTextureEffect.h
+++ b/src/gpu/effects/GrSimpleTextureEffect.h
@@ -15,7 +15,6 @@
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
#include "GrColorSpaceXform.h"
-#include "effects/GrProxyMove.h"
class GrSimpleTextureEffect : public GrFragmentProcessor {
public:
sk_sp<GrColorSpaceXform> colorXform() const { return fColorXform; }
diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp
index fdc2b3bd36..13f6cd3c75 100644
--- a/src/sksl/SkSLHCodeGenerator.cpp
+++ b/src/sksl/SkSLHCodeGenerator.cpp
@@ -236,8 +236,7 @@ bool HCodeGenerator::generateCode() {
this->writeSection(HEADER_SECTION);
this->writef("#include \"GrFragmentProcessor.h\"\n"
"#include \"GrCoordTransform.h\"\n"
- "#include \"GrColorSpaceXform.h\"\n"
- "#include \"effects/GrProxyMove.h\"\n");
+ "#include \"GrColorSpaceXform.h\"\n");
this->writef("class %s : public GrFragmentProcessor {\n"
"public:\n",
fFullName.c_str());
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp
index bf8e835bba..dc4ef93aa3 100644
--- a/tests/SkSLFPTest.cpp
+++ b/tests/SkSLFPTest.cpp
@@ -83,7 +83,6 @@ DEF_TEST(SkSLFPHelloWorld, r) {
"#include \"GrFragmentProcessor.h\"\n"
"#include \"GrCoordTransform.h\"\n"
"#include \"GrColorSpaceXform.h\"\n"
- "#include \"effects/GrProxyMove.h\"\n"
"class GrTest : public GrFragmentProcessor {\n"
"public:\n"
" static sk_sp<GrFragmentProcessor> Make() {\n"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-23 03:41:17 +0000