rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-04 17:52:10 +01:00
Code Issues Projects Releases Wiki Activity
dxvk/src/dxgi/dxgi_include.h

29 lines
704 B
C
Raw Normal View History

[dxgi] Implemented some DXGI classes
2017-10-11 03:09:04 +02:00
#pragma once
Add support for MSVC, attempt 3 (#130) * [dxvk] fixes for MSVC * nullptr -> int is illegal conversion for MSVC. nullptr was replaced with VK_NULL_HANDLE * MSVC does not support source code strings longer than 65535 chars. String was replaced with array of chars. * [utils] fixes for MSVC * __mingw_uuidof() does not exists in MSVC * apply GCC pragma only for GCC * added missing header * [dxbc] fixes for MSVC *added missing header * [dxgi] fixes for MSVC * user __declspec(uuid()) instead of _mingw_uuidof() * do not use DLLEXPORT macro for MSVC * [d3d11] fixes for MSVC * replace WINBOOL with BOOL * do not declare D3D11 structs for MSVC * do not use DLLEXPORT macro for MSVC * [meson] fix build scripts for MSVC * change cpp version from c++1z to c++latest for MSVC * set -DOMINMAX definition for MSVC * disable test and wine_utils for MSVC * use .def files instead of __declspec(dllexport) for MSVC (bypass 'C2375: redefinition; different linkage' error) * fix .def files for MinGW * add --enable-stdcall-fixup linker flag for MinGW
2018-03-06 20:34:34 +03:00
//for some reason we need to specify __declspec(dllexport) for MinGW
[dxgi] Correct DLLEXPORT for native builds
2022-08-21 17:39:22 +00:00
#if defined(__WINE__) || !defined(_WIN32)
[dxgi] Revert 538b132490967239e2d673659789ea9b76698ee3 This breaks things for 32-bit, but it really shouldn't. My hypothesis currently is that the .lib generated is bogus, but the exports in the actual DLL are correct.
2022-08-21 20:28:40 +00:00
#define DLLEXPORT __attribute__((visibility("default")))
Add support for MSVC, attempt 3 (#130) * [dxvk] fixes for MSVC * nullptr -> int is illegal conversion for MSVC. nullptr was replaced with VK_NULL_HANDLE * MSVC does not support source code strings longer than 65535 chars. String was replaced with array of chars. * [utils] fixes for MSVC * __mingw_uuidof() does not exists in MSVC * apply GCC pragma only for GCC * added missing header * [dxbc] fixes for MSVC *added missing header * [dxgi] fixes for MSVC * user __declspec(uuid()) instead of _mingw_uuidof() * do not use DLLEXPORT macro for MSVC * [d3d11] fixes for MSVC * replace WINBOOL with BOOL * do not declare D3D11 structs for MSVC * do not use DLLEXPORT macro for MSVC * [meson] fix build scripts for MSVC * change cpp version from c++1z to c++latest for MSVC * set -DOMINMAX definition for MSVC * disable test and wine_utils for MSVC * use .def files instead of __declspec(dllexport) for MSVC (bypass 'C2375: redefinition; different linkage' error) * fix .def files for MinGW * add --enable-stdcall-fixup linker flag for MinGW
2018-03-06 20:34:34 +03:00
#else
build: Disable stdcall alias-ing and use kill-at Disable stdcall aliasing and enable kill-at to ensure our exported functions don't have the @8, @40, etc suffixes. This still keeps `--enable-stdcall-fixup` as otherwise the linker can get confused trying to find exports from the .def. This does not result in aliases being added, just for them to be found to add to the export table. This also switches d3d11 to use the MinGW provided dxgi.lib for linking and d3d10 to use the MinGW provided d3d11.lib for linking. Unfortunately the .a's we output seem to still have the @blah that we killed so we cannot use them for internal linkage since using kill-at. Tested that what we get out of MinGW now is what we want with dllexp. Supercedes: #3590 Exports ``` ➜ build git:(master) ✗ winedump -j export src/dxgi/dxgi.dll Contents of src/dxgi/dxgi.dll: 129505860 bytes Name: DXGI.DLL Characteristics: 00000000 TimeDateStamp: 64C97A2D Tue Aug 1 22:33:33 2023 Version: 0.00 Ordinal base: 9 # of functions: 9 # of Names: 5 Addresses of functions: 00423028 Addresses of name ordinals: 00423060 Addresses of names: 0042304C Entry Pt Ordn Name 00007C17 9 CreateDXGIFactory 00007BF3 10 CreateDXGIFactory1 00007B62 11 CreateDXGIFactory2 00007C3B 16 DXGIDeclareAdapterRemovalSupport 00007CD8 17 DXGIGetDebugInterface1 Done dumping src/dxgi/dxgi.dll ``` ``` ➜ build git:(fix-stdcall-32-bit) winedump -j export src/d3d11/d3d11.dll Contents of src/d3d11/d3d11.dll: 263021637 bytes Name: D3D11.DLL Characteristics: 00000000 TimeDateStamp: 64C97A2E Tue Aug 1 22:33:34 2023 Version: 0.00 Ordinal base: 18 # of functions: 7 # of Names: 4 Addresses of functions: 005E3028 Addresses of name ordinals: 005E3054 Addresses of names: 005E3044 Entry Pt Ordn Name 00020045 18 D3D11CoreCreateDevice 000200AA 22 D3D11CreateDevice 0002010E 23 D3D11CreateDeviceAndSwapChain 0002025F 24 D3D11On12CreateDevice Done dumping src/d3d11/d3d11.dll ``` Import of DXGI in D3D11 ``` offset 005e1014 dxgi.dll Hint/Name Table: 005E408C TimeDateStamp: 00000000 (Thu Jan 1 01:00:00 1970) ForwarderChain: 00000000 First thunk RVA: 005E4300 Thunk Ordn Name 005e4300 4 CreateDXGIFactory1 ```
2023-08-01 22:41:49 +01:00
#define DLLEXPORT
Add support for MSVC, attempt 3 (#130) * [dxvk] fixes for MSVC * nullptr -> int is illegal conversion for MSVC. nullptr was replaced with VK_NULL_HANDLE * MSVC does not support source code strings longer than 65535 chars. String was replaced with array of chars. * [utils] fixes for MSVC * __mingw_uuidof() does not exists in MSVC * apply GCC pragma only for GCC * added missing header * [dxbc] fixes for MSVC *added missing header * [dxgi] fixes for MSVC * user __declspec(uuid()) instead of _mingw_uuidof() * do not use DLLEXPORT macro for MSVC * [d3d11] fixes for MSVC * replace WINBOOL with BOOL * do not declare D3D11 structs for MSVC * do not use DLLEXPORT macro for MSVC * [meson] fix build scripts for MSVC * change cpp version from c++1z to c++latest for MSVC * set -DOMINMAX definition for MSVC * disable test and wine_utils for MSVC * use .def files instead of __declspec(dllexport) for MSVC (bypass 'C2375: redefinition; different linkage' error) * fix .def files for MinGW * add --enable-stdcall-fixup linker flag for MinGW
2018-03-06 20:34:34 +03:00
#endif
[dxgi] Implemented some DXGI classes
2017-10-11 03:09:04 +02:00
#include "../util/com/com_guid.h"
#include "../util/com/com_object.h"
#include "../util/com/com_pointer.h"
#include "../util/log/log.h"
#include "../util/log/log_debug.h"
[dxgi] Implemented DxgiDevice
2017-10-11 15:31:36 +02:00
#include "../util/rc/util_rc.h"
#include "../util/rc/util_rc_ptr.h"
[dxgi] Make faking Dx10 support a per-app option Also whitelist World of Warcraft, which requires this hack for now.
2018-07-20 13:49:07 +02:00
#include "../util/util_env.h"
[dxgi] Implemented some DXGI classes
2017-10-11 03:09:04 +02:00
#include "../util/util_enum.h"
#include "../util/util_error.h"
[d3d11] Added D3D11Options Includes a per-app knob for Witcher 3 to disable D3D11_MAP_FLAG_DO_NOT_WAIT.
2018-03-24 17:02:24 +01:00
#include "../util/util_flags.h"
[util] Add likely/unlikely macros
2018-11-29 22:52:03 +01:00
#include "../util/util_likely.h"
[d3d11] Fixed buffer bindings with non-zero offsets
2017-12-14 19:07:08 +01:00
#include "../util/util_math.h"
[dxgi] Implemented some DXGI classes
2017-10-11 03:09:04 +02:00
#include "../util/util_string.h"
[dxgi] Include DXGI 1.6 headers
2020-04-28 14:44:05 +02:00
#include <dxgi1_6.h>
Reference in New Issue Copy Permalink