Mesa (main): d3d10umd: Rename Dxgi.h to DxgiFns.h.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b3c1090a5f9ae0e7999632219214fadb5a1d526e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3c1090a5f9ae0e7999632219214fadb5a1d526e

Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Mon Jul 19 14:34:06 2021 +0100

d3d10umd: Rename Dxgi.h to DxgiFns.h.

To avoid clashing with the WinSDK's dxgi.h header, which we'll need later.

Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11973>

---

 src/gallium/frontends/d3d10umd/Device.cpp                |  2 +-
 src/gallium/frontends/d3d10umd/{Dxgi.cpp => DxgiFns.cpp} | 16 ++++++++--------
 src/gallium/frontends/d3d10umd/{Dxgi.h => DxgiFns.h}     |  4 ++--
 src/gallium/frontends/d3d10umd/meson.build               |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gallium/frontends/d3d10umd/Device.cpp b/src/gallium/frontends/d3d10umd/Device.cpp
index afca18819ce..cd2c6cd9180 100644
--- a/src/gallium/frontends/d3d10umd/Device.cpp
+++ b/src/gallium/frontends/d3d10umd/Device.cpp
@@ -32,7 +32,7 @@
 
 
 #include "Draw.h"
-#include "Dxgi.h"
+#include "DxgiFns.h"
 #include "InputAssembly.h"
 #include "OutputMerger.h"
 #include "Query.h"
diff --git a/src/gallium/frontends/d3d10umd/Dxgi.cpp b/src/gallium/frontends/d3d10umd/DxgiFns.cpp
similarity index 97%
rename from src/gallium/frontends/d3d10umd/Dxgi.cpp
rename to src/gallium/frontends/d3d10umd/DxgiFns.cpp
index 253f81ed283..cd844a2b0fa 100644
--- a/src/gallium/frontends/d3d10umd/Dxgi.cpp
+++ b/src/gallium/frontends/d3d10umd/DxgiFns.cpp
@@ -26,13 +26,13 @@
  **************************************************************************/
 
 /*
- * Dxgi.cpp --
+ * DxgiFns.cpp --
  *    DXGI related functions.
  */
 
 #include <stdio.h>
 
-#include "Dxgi.h"
+#include "DxgiFns.h"
 #include "Format.h"
 #include "State.h"
 
@@ -97,11 +97,11 @@ _Present(DXGI_DDI_ARG_PRESENT *pPresentData)
 
    void *map;
    struct pipe_transfer *transfer;
-   map = pipe_transfer_map(pipe,
-                           pSrcResource->resource,
-                           0, 0, PIPE_MAP_READ,
-                           0, 0, w, h,
-                           &transfer);
+   map = pipe_texture_map(pipe,
+                          pSrcResource->resource,
+                          0, 0, PIPE_MAP_READ,
+                          0, 0, w, h,
+                          &transfer);
    if (map) {
 
       BITMAPINFO bmi;
@@ -172,7 +172,7 @@ _Present(DXGI_DDI_ARG_PRESENT *pPresentData)
       DeleteDC(hdcMem);
       DeleteObject(hBmp);
 
-      pipe_transfer_unmap(pipe, transfer);
+      pipe_texture_unmap(pipe, transfer);
    }
 
    ReleaseDC(hWnd, hDC);
diff --git a/src/gallium/frontends/d3d10umd/Dxgi.h b/src/gallium/frontends/d3d10umd/DxgiFns.h
similarity index 96%
rename from src/gallium/frontends/d3d10umd/Dxgi.h
rename to src/gallium/frontends/d3d10umd/DxgiFns.h
index dedc2542d6a..3689faa307c 100644
--- a/src/gallium/frontends/d3d10umd/Dxgi.h
+++ b/src/gallium/frontends/d3d10umd/DxgiFns.h
@@ -26,8 +26,8 @@
  **************************************************************************/
 
 /*
- * Dxgi.h --
- *    Functions that manipulate GPU resources.
+ * DxgiFns.h --
+ *    DXGI related functions
  */
 
 #ifndef WRAP_DXGI_H
diff --git a/src/gallium/frontends/d3d10umd/meson.build b/src/gallium/frontends/d3d10umd/meson.build
index 90774d9217d..7141c8da17f 100644
--- a/src/gallium/frontends/d3d10umd/meson.build
+++ b/src/gallium/frontends/d3d10umd/meson.build
@@ -14,7 +14,7 @@ libd3d10umd = static_library(
     'Debug.cpp',
     'Device.cpp',
     'Draw.cpp',
-    'Dxgi.cpp',
+    'DxgiFns.cpp',
     'Format.cpp',
     'InputAssembly.cpp',
     'OutputMerger.cpp',