Reland "Create D3D device and queue"

This is a reland of 29dc430

Original change's description:
> Create D3D device and queue
> 
> Bug: skia:9935
> Change-Id: Ib6548f413ca3a8befb553d2d47354b400c9162b9
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272520
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>

Bug: skia:9935
Change-Id: I1c8797e09cdeb3694ea7f47b2236ab7d91d9519f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272996
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

Author: jvanverth

BUILD.gn

@@ -601,6 +601,9 @@ optional("gpu") {
     public_defines += [ "SK_DIRECT3D" ]
     deps += [ "//third_party/spirv-cross:spirv_cross" ]
     sources += skia_direct3d_sources
+    if (skia_enable_direct3d_debug_layer) {
+      public_defines += [ "SK_ENABLE_D3D_DEBUG_LAYER" ]
+    }
     libs += [
       "d3d12.lib",
       "dxgi.lib",
@@ -1385,6 +1388,7 @@ if (skia_enable_tools) {
     }
     if (skia_use_direct3d) {
       sources += [ "tools/gpu/d3d/D3DTestContext.cpp" ]
+      sources += [ "tools/gpu/d3d/D3DTestUtils.cpp" ]
     }
     if (skia_use_dawn) {
       public_deps += [ "//third_party/dawn:dawn_headers" ]

gm/rectangletexture.cpp

@@ -94,7 +94,7 @@ class RectangleTexture : public GpuGM {
             return nullptr;
         }
 
-        const GrGLInterface* gl = glCtx->interface();
+        const GrGLInterface* gl = glCtx->glInterface();
         // Useful for debugging whether errors result from use of RECTANGLE
         // static constexpr GrGLenum kTarget = GR_GL_TEXTURE_2D;
         static constexpr GrGLenum kTarget = GR_GL_TEXTURE_RECTANGLE;

gn/gpu.gni

@@ -727,6 +727,8 @@ skia_vk_sources = [
 ]
 
 skia_direct3d_sources = [
+  "$_include/gpu/d3d/GrD3DBackendContext.h",
+  "$_include/gpu/d3d/GrD3D12.h",
   "$_src/gpu/d3d/GrD3DCaps.cpp",
   "$_src/gpu/d3d/GrD3DCaps.h",
   "$_src/gpu/d3d/GrD3DGpu.cpp",

gn/skia.gni

@@ -26,7 +26,7 @@ declare_args() {
       is_skia_dev_build && ((target_cpu == "x64" && (is_linux || is_mac)) ||
                             (target_cpu == "arm64" && is_android))
   skia_enable_tools = is_skia_dev_build
-  skia_enable_vulkan_debug_layers = is_skia_dev_build && is_debug
+  skia_enable_gpu_debug_layers = is_skia_dev_build && is_debug
   skia_generate_workarounds = false
   skia_include_multiframe_procs = false
   skia_lex = false
@@ -96,6 +96,8 @@ declare_args() {
   skia_use_dng_sdk = !is_fuchsia && skia_use_libjpeg_turbo && skia_use_zlib
   skia_use_libgifcodec = !skia_use_wuffs
   skia_use_sfntly = skia_use_icu
+  skia_enable_vulkan_debug_layers = skia_enable_gpu_debug_layers
+  skia_enable_direct3d_debug_layer = skia_enable_gpu_debug_layers
 }
 
 # Our tools require static linking (they use non-exported symbols), and the GPU backend.

include/gpu/d3d/GrD3D12.h

@@ -0,0 +1,18 @@
+/*
+ * 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 GrD3D12_DEFINED
+#define GrD3D12_DEFINED
+
+#include <d3d12.h>
+#include <wrl/client.h>  // for ComPtr
+
+// Abbreviate and alias ComPtr
+template<typename T>
+using gr_cp = Microsoft::WRL::ComPtr<T>;
+
+#endif

include/gpu/d3d/GrD3DBackendContext.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
@@ -8,11 +8,16 @@
 #ifndef GrD3DBackendContext_DEFINED
 #define GrD3DBackendContext_DEFINED
 
-#include "include/core/SkRefCnt.h"
+#include "include/gpu/d3d/GrD3D12.h"
+
+#include "include/gpu/GrTypes.h"
 
 // The BackendContext contains all of the base D3D objects needed by the GrD3DGpu. The assumption
 // is that the client will set these up and pass them to the GrD3DGpu constructor.
 struct SK_API GrD3DBackendContext {
+    gr_cp<ID3D12Device> fDevice;
+    gr_cp<ID3D12CommandQueue> fQueue;
+    GrProtected fProtectedContext = GrProtected::kNo;
 };
 
 #endif

public.bzl

@@ -250,6 +250,9 @@ BASE_SRCS_ALL = struct(
         # Currently exclude all vulkan specific files
         "src/gpu/vk/*",
 
+        # Currently exclude all Direct3D specific files
+        "src/gpu/d3d/*",
+
         # Currently exclude all Dawn-specific files
         "src/gpu/dawn/*",
 
@@ -534,6 +537,7 @@ DM_SRCS_ALL = struct(
         "tests/SkParagraphTest.cpp",  # Skipping tests for now.
         "tests/skia_test.cpp",  # Old main.
         "tools/gpu/atlastext/*",
+        "tools/gpu/d3d/*",
         "tools/gpu/dawn/*",
         "tools/gpu/gl/angle/*",
         "tools/gpu/gl/egl/*",

src/gpu/GrLegacyDirectContext.cpp

@@ -125,9 +125,9 @@ class GrLegacyDirectContext : public GrContext {
 };
 
 #ifdef SK_GL
-sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> interface) {
+sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> glInterface) {
     GrContextOptions defaultOptions;
-    return MakeGL(std::move(interface), defaultOptions);
+    return MakeGL(std::move(glInterface), defaultOptions);
 }
 
 sk_sp<GrContext> GrContext::MakeGL(const GrContextOptions& options) {
@@ -139,11 +139,11 @@ sk_sp<GrContext> GrContext::MakeGL() {
     return MakeGL(nullptr, defaultOptions);
 }
 
-sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> interface,
+sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> glInterface,
                                    const GrContextOptions& options) {
     sk_sp<GrContext> context(new GrLegacyDirectContext(GrBackendApi::kOpenGL, options));
 
-    context->fGpu = GrGLGpu::Make(std::move(interface), options, context.get());
+    context->fGpu = GrGLGpu::Make(std::move(glInterface), options, context.get());
     if (!context->fGpu) {
         return nullptr;
     }

src/gpu/d3d/GrD3DCaps.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

src/gpu/d3d/GrD3DCaps.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.