Move GrTypesPriv.h to include/private
Bug: skia:
Change-Id: I68610fed67a70454a815229c47b78ea6d9463a43
Reviewed-on: https://skia-review.googlesource.com/24624
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/gn/gpu.gni b/gn/gpu.gni
index dba90bf..ae7d991 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -24,7 +24,6 @@
"$_include/gpu/GrTexture.h",
"$_include/gpu/GrSamplerParams.h",
"$_include/gpu/GrTypes.h",
- "$_include/gpu/GrTypesPriv.h",
"$_include/gpu/gl/GrGLAssembleInterface.h",
"$_include/gpu/gl/GrGLConfig.h",
@@ -42,6 +41,7 @@
"$_include/private/GrSurfaceProxy.h",
"$_include/private/GrSwizzle.h",
"$_include/private/GrTextureProxy.h",
+ "$_include/private/GrTypesPriv.h",
"$_src/gpu/GrAppliedClip.h",
"$_src/gpu/GrAuditTrail.cpp",
diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h
index f7827d3..cc24846 100644
--- a/include/gpu/GrCaps.h
+++ b/include/gpu/GrCaps.h
@@ -8,8 +8,7 @@
#ifndef GrCaps_DEFINED
#define GrCaps_DEFINED
-#include "GrTypes.h"
-#include "GrTypesPriv.h"
+#include "../private/GrTypesPriv.h"
#include "GrBlend.h"
#include "GrShaderCaps.h"
#include "SkRefCnt.h"
diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h
index 1ed64ad..677460e 100644
--- a/include/gpu/GrGpuResource.h
+++ b/include/gpu/GrGpuResource.h
@@ -8,8 +8,8 @@
#ifndef GrGpuResource_DEFINED
#define GrGpuResource_DEFINED
+#include "../private/GrTypesPriv.h"
#include "GrResourceKey.h"
-#include "GrTypesPriv.h"
class GrContext;
class GrGpu;
diff --git a/include/gpu/GrTypesPriv.h b/include/private/GrTypesPriv.h
similarity index 93%
rename from include/gpu/GrTypesPriv.h
rename to include/private/GrTypesPriv.h
index 72915e8..05c1341 100644
--- a/include/gpu/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -310,7 +310,7 @@
/**
* Types used to describe format of vertices in arrays.
- */
+ */
enum GrVertexAttribType {
kFloat_GrVertexAttribType = 0,
kVec2f_GrVertexAttribType,
@@ -324,7 +324,7 @@
kUByte_GrVertexAttribType, // unsigned byte, e.g. coverage
kVec4ub_GrVertexAttribType, // vector of 4 unsigned bytes, e.g. colors
- kVec2us_GrVertexAttribType, // vector of 2 shorts, e.g. texture coordinates
+ kVec2us_GrVertexAttribType, // vector of 2 shorts, e.g. texture coordinates
kInt_GrVertexAttribType,
kUint_GrVertexAttribType,
@@ -333,7 +333,6 @@
};
static const int kGrVertexAttribTypeCount = kLast_GrVertexAttribType + 1;
-
/**
* Returns the size of the attrib type in bytes.
*/
@@ -342,23 +341,23 @@
case kFloat_GrVertexAttribType:
return sizeof(float);
case kVec2f_GrVertexAttribType:
- return 2*sizeof(float);
+ return 2 * sizeof(float);
case kVec3f_GrVertexAttribType:
- return 3*sizeof(float);
+ return 3 * sizeof(float);
case kVec4f_GrVertexAttribType:
- return 4*sizeof(float);
+ return 4 * sizeof(float);
case kVec2i_GrVertexAttribType:
- return 2*sizeof(int32_t);
+ return 2 * sizeof(int32_t);
case kVec3i_GrVertexAttribType:
- return 3*sizeof(int32_t);
+ return 3 * sizeof(int32_t);
case kVec4i_GrVertexAttribType:
- return 4*sizeof(int32_t);
+ return 4 * sizeof(int32_t);
case kUByte_GrVertexAttribType:
- return 1*sizeof(char);
+ return 1 * sizeof(char);
case kVec4ub_GrVertexAttribType:
- return 4*sizeof(char);
+ return 4 * sizeof(char);
case kVec2us_GrVertexAttribType:
- return 2*sizeof(int16_t);
+ return 2 * sizeof(int16_t);
case kInt_GrVertexAttribType:
return sizeof(int32_t);
case kUint_GrVertexAttribType:
@@ -470,11 +469,11 @@
//////////////////////////////////////////////////////////////////////////////
/**
-* We have coverage effects that clip rendering to the edge of some geometric primitive.
-* This enum specifies how that clipping is performed. Not all factories that take a
-* GrProcessorEdgeType will succeed with all values and it is up to the caller to check for
-* a NULL return.
-*/
+ * We have coverage effects that clip rendering to the edge of some geometric primitive.
+ * This enum specifies how that clipping is performed. Not all factories that take a
+ * GrProcessorEdgeType will succeed with all values and it is up to the caller to check for
+ * a NULL return.
+ */
enum GrPrimitiveEdgeType {
kFillBW_GrProcessorEdgeType,
kFillAA_GrProcessorEdgeType,
@@ -497,7 +496,8 @@
}
static inline bool GrProcessorEdgeTypeIsAA(const GrPrimitiveEdgeType edgeType) {
- return (kFillBW_GrProcessorEdgeType != edgeType && kInverseFillBW_GrProcessorEdgeType != edgeType);
+ return (kFillBW_GrProcessorEdgeType != edgeType &&
+ kInverseFillBW_GrProcessorEdgeType != edgeType);
}
static inline GrPrimitiveEdgeType GrInvertProcessorEdgeType(const GrPrimitiveEdgeType edgeType) {
@@ -513,7 +513,7 @@
case kHairlineAA_GrProcessorEdgeType:
SkFAIL("Hairline fill isn't invertible.");
}
- return kFillAA_GrProcessorEdgeType; // suppress warning.
+ return kFillAA_GrProcessorEdgeType; // suppress warning.
}
/**
@@ -526,8 +526,8 @@
};
/**
-* Indicates the type of data that a GPU buffer will be used for.
-*/
+ * Indicates the type of data that a GPU buffer will be used for.
+ */
enum GrBufferType {
kVertex_GrBufferType,
kIndex_GrBufferType,
@@ -549,8 +549,8 @@
}
/**
-* Provides a performance hint regarding the frequency at which a data store will be accessed.
-*/
+ * Provides a performance hint regarding the frequency at which a data store will be accessed.
+ */
enum GrAccessPattern {
/** Data store will be respecified repeatedly and used many times. */
kDynamic_GrAccessPattern,
@@ -585,9 +585,9 @@
#ifdef SK_DEBUG
// Takes a pointer to a GrCaps, and will suppress prints if required
-#define GrCapsDebugf(caps, ...) \
- if (!(caps)->suppressPrints()) { \
- SkDebugf(__VA_ARGS__); \
+#define GrCapsDebugf(caps, ...) \
+ if (!(caps)->suppressPrints()) { \
+ SkDebugf(__VA_ARGS__); \
}
#else
#define GrCapsDebugf(caps, ...)