[graphite] Remove use of GraphiteTypesPriv and move to *Types in src.

We should only be using include/private for types that actually are
needed in include/ files. I moved everything that was just in src to
new src/*Types.h files. This actually left nothing in GraphiteTypesPriv
for now, so I deleted it. If we actually need private types that are
part of include/ we can add it back later.

Bug: skia:12466
Change-Id: I180fc2032afd47bc6c5e8b9ccd4954b5d2451fc7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471758
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

Author: egdaniel

experimental/graphite/include/private/GraphiteTypesPriv.h

@@ -8,7 +8,7 @@
 #ifndef skgpu_Buffer_DEFINED
 #define skgpu_Buffer_DEFINED
 
-#include "experimental/graphite/include/private/GraphiteTypesPriv.h"
+#include "experimental/graphite/src/ResourceTypes.h"
 #include "include/core/SkRefCnt.h"
 
 namespace skgpu {

experimental/graphite/src/Buffer.h

@@ -8,7 +8,7 @@
 #ifndef skgpu_Caps_DEFINED
 #define skgpu_Caps_DEFINED
 
-#include "experimental/graphite/include/private/GraphiteTypesPriv.h"
+#include "experimental/graphite/src/ResourceTypes.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
 

experimental/graphite/src/Caps.h

@@ -7,7 +7,6 @@
 
 #include "experimental/graphite/src/CommandBuffer.h"
 
-#include "experimental/graphite/include/private/GraphiteTypesPriv.h"
 #include "experimental/graphite/src/GraphicsPipeline.h"
 #include "src/core/SkTraceEvent.h"
 

experimental/graphite/src/CommandBuffer.cpp

@@ -8,7 +8,7 @@
 #ifndef skgpu_CommandBuffer_DEFINED
 #define skgpu_CommandBuffer_DEFINED
 
-#include "experimental/graphite/include/private/GraphiteTypesPriv.h"
+#include "experimental/graphite/src/DrawTypes.h"
 #include "include/core/SkColor.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"

experimental/graphite/src/CommandBuffer.h

@@ -8,6 +8,7 @@
 #include "experimental/graphite/src/ContextUtils.h"
 
 #include <string>
+#include "experimental/graphite/src/DrawTypes.h"
 #include "experimental/graphite/src/Uniform.h"
 #include "experimental/graphite/src/UniformCache.h"
 #include "experimental/graphite/src/UniformManager.h"

experimental/graphite/src/ContextUtils.cpp

@@ -10,8 +10,8 @@
 
 #include "src/core/SkDevice.h"
 
-#include "experimental/graphite/include/private/GraphiteTypesPriv.h"
 #include "experimental/graphite/src/DrawOrder.h"
+#include "experimental/graphite/src/EnumBitMask.h"
 #include "experimental/graphite/src/geom/Rect.h"
 
 class SkStrokeRec;

experimental/graphite/src/Device.h

@@ -29,7 +29,7 @@ static bool can_fit(size_t requestedSize,
                     Buffer* buffer,
                     size_t currentOffset,
                     size_t alignment) {
-    size_t startOffset = AlignTo(currentOffset, alignment);
+    size_t startOffset = SkAlignTo(currentOffset, alignment);
     return requestedSize <= (buffer->size() - startOffset);
 }
 
@@ -117,7 +117,7 @@ std::tuple<UniformWriter, BindBufferInfo> DrawBufferManager::getUniformWriter(
             return {UniformWriter(), BindBufferInfo()};
         }
     }
-    fUniformOffset = AlignTo(fUniformOffset, fUniformStartAlignment);
+    fUniformOffset = SkAlignTo(fUniformOffset, fUniformStartAlignment);
     BindBufferInfo bindInfo;
     bindInfo.fBuffer = fCurrentUniformBuffer.get();
     bindInfo.fOffset = fUniformOffset;

experimental/graphite/src/DrawBufferManager.cpp

@@ -8,7 +8,7 @@
 #ifndef skgpu_DrawBufferManager_DEFINED
 #define skgpu_DrawBufferManager_DEFINED
 
-#include "experimental/graphite/include/private/GraphiteTypesPriv.h"
+#include "experimental/graphite/src/DrawTypes.h"
 #include "include/core/SkRefCnt.h"
 #include "src/gpu/BufferWriter.h"
 

experimental/graphite/src/DrawBufferManager.h

@@ -11,9 +11,9 @@
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
 
-#include "experimental/graphite/include/private/GraphiteTypesPriv.h"
 #include "experimental/graphite/src/DrawList.h"
 #include "experimental/graphite/src/DrawOrder.h"
+#include "experimental/graphite/src/DrawTypes.h"
 
 #include <vector>