commit 0e32aa8a3a1ededcfe6642449b5a81d32ab17332
author Greg Daniel <egdaniel@google.com> Tue Aug 31 12:07:54 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Aug 31 18:49:46 2021 +0000
tree e10cd3bfa21dec8f21d32a888627ace167596806
parent 30a6b101f43935f6016c0af5fdd70b078161709f

Rename some GrD3DTypes* header files.

I want to free up GrD3DTypesPriv to actually be private types that
include real d3d objects.

Change-Id: Id38d6baae4fa68c19301b27d4f9d51eb1d9c5db0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/443676
Commit-Queue: Greg Daniel <egdaniel@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Auto-Submit: Greg Daniel <egdaniel@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

include/gpu/GrBackendSemaphore.h

diff --git a/include/gpu/GrBackendSemaphore.h b/include/gpu/GrBackendSemaphore.h
index b7043bf..e961490 100644
--- a/include/gpu/GrBackendSemaphore.h
+++ b/include/gpu/GrBackendSemaphore.h
@@ -14,7 +14,7 @@
 #include "include/gpu/mtl/GrMtlTypes.h"
 #include "include/gpu/vk/GrVkTypes.h"
 #ifdef SK_DIRECT3D
-#include "include/gpu/d3d/GrD3DTypesMinimal.h"
+#include "include/private/GrD3DTypesMinimal.h"
 #endif
 
 /**

include/gpu/GrBackendSurface.h

diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h
index 793a54e..6349bab 100644
--- a/include/gpu/GrBackendSurface.h
+++ b/include/gpu/GrBackendSurface.h
@@ -34,8 +34,7 @@
 #endif
 
 #ifdef SK_DIRECT3D
-#include "include/gpu/d3d/GrD3DTypesMinimal.h"
-#include "include/private/GrD3DTypesPriv.h"
+#include "include/private/GrD3DTypesMinimal.h"
 class GrD3DResourceState;
 #endif
 

include/gpu/d3d/GrD3DTypes.h

diff --git a/include/gpu/d3d/GrD3DTypes.h b/include/gpu/d3d/GrD3DTypes.h
index 33c079d..f2a2165 100644
--- a/include/gpu/d3d/GrD3DTypes.h
+++ b/include/gpu/d3d/GrD3DTypes.h
@@ -22,7 +22,7 @@
 // prepared to rename those identifiers. Otherwise use GrD3DTypesMinimal.h.
 
 #include "include/core/SkRefCnt.h"
-#include "include/gpu/d3d/GrD3DTypesMinimal.h"
+#include "include/gpu/GrTypes.h"
 #include <d3d12.h>
 #include <dxgi1_4.h>
 
@@ -206,10 +206,10 @@
             , fProtected(isProtected) {}
 
     GrD3DTextureResourceInfo(const GrD3DTextureResourceInfo& info,
-                             GrD3DResourceStateEnum resourceState)
+                             D3D12_RESOURCE_STATES resourceState)
             : fResource(info.fResource)
             , fAlloc(info.fAlloc)
-            , fResourceState(static_cast<D3D12_RESOURCE_STATES>(resourceState))
+            , fResourceState(resourceState)
             , fFormat(info.fFormat)
             , fSampleCount(info.fSampleCount)
             , fLevelCount(info.fLevelCount)

include/gpu/d3d/GrD3DTypesMinimal.h

diff --git a/include/gpu/d3d/GrD3DTypesMinimal.h b/include/gpu/d3d/GrD3DTypesMinimal.h
deleted file mode 100644
index 704113e..0000000
--- a/include/gpu/d3d/GrD3DTypesMinimal.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrD3DTypesMinimal_DEFINED
-#define GrD3DTypesMinimal_DEFINED
-
-// Minimal definitions of Direct3D types, without including d3d12.h
-
-#include <dxgiformat.h>
-
-#include <functional>
-#include "include/gpu/GrTypes.h"
-
-struct ID3D12Resource;
-typedef int GrD3DResourceStateEnum;
-struct GrD3DTextureResourceInfo;
-struct GrD3DFenceInfo;
-
-#endif