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@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11973>
This commit is contained in:
Jose Fonseca 2021-07-19 14:34:06 +01:00 committed by Marge Bot
parent d944136f36
commit b3c1090a5f
4 changed files with 12 additions and 12 deletions

View file

@ -32,7 +32,7 @@
#include "Draw.h"
#include "Dxgi.h"
#include "DxgiFns.h"
#include "InputAssembly.h"
#include "OutputMerger.h"
#include "Query.h"

View file

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

View file

@ -26,8 +26,8 @@
**************************************************************************/
/*
* Dxgi.h --
* Functions that manipulate GPU resources.
* DxgiFns.h --
* DXGI related functions
*/
#ifndef WRAP_DXGI_H

View file

@ -14,7 +14,7 @@ libd3d10umd = static_library(
'Debug.cpp',
'Device.cpp',
'Draw.cpp',
'Dxgi.cpp',
'DxgiFns.cpp',
'Format.cpp',
'InputAssembly.cpp',
'OutputMerger.cpp',