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>
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)