mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 07:28:11 +02:00
d3d12: Include dxguids/dxguids.h in files that need __uuidof
MSVC has an extension for getting IIDs (GUIDs) from types. Other compilers can support this extension when targeting Windows, but don't support it when targeting Linux. Instead, winadapter.h defines __uuidof(var) to uuidof<decltype(var)>. Then dxguids.h provides inline specialized definitions for the known D3D types. Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7937>
This commit is contained in:
parent
da9b6a21f4
commit
e1e05ad772
11 changed files with 18 additions and 0 deletions
|
|
@ -33,6 +33,8 @@
|
|||
#include "util/set.h"
|
||||
#include "util/u_inlines.h"
|
||||
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
bool
|
||||
d3d12_init_batch(struct d3d12_context *ctx, struct d3d12_batch *batch)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
#include "util/u_memory.h"
|
||||
|
||||
#include <directx/d3d12.h>
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
struct d3d12_bufmgr {
|
||||
struct pb_manager base;
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@
|
|||
#include "util/u_simple_shaders.h"
|
||||
|
||||
#include <directx/d3d12.h>
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
#include <dxcapi.h>
|
||||
#include <wrl.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@
|
|||
|
||||
#include "D3D12ResourceState.h"
|
||||
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
extern "C" {
|
||||
#include "indices/u_primconvert.h"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
#include "util/u_memory.h"
|
||||
|
||||
#include <directx/d3d12.h>
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
struct d3d12_descriptor_pool {
|
||||
ID3D12Device *dev;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "util/u_memory.h"
|
||||
|
||||
#include <directx/dxcore.h>
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
static IDXCoreAdapterFactory *
|
||||
get_dxcore_factory()
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@
|
|||
#include "util/u_memory.h"
|
||||
#include "util/u_prim.h"
|
||||
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
struct d3d12_pso_entry {
|
||||
struct d3d12_gfx_pipeline_state key;
|
||||
ID3D12PipelineState *pso;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@
|
|||
#include "util/u_inlines.h"
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
struct d3d12_query {
|
||||
enum pipe_query_type type;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
#include "frontend/sw_winsys.h"
|
||||
|
||||
#include <directx/d3d12.h>
|
||||
#include <dxguids/dxguids.h>
|
||||
#include <memory>
|
||||
|
||||
static bool
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
#include <wrl.h>
|
||||
using Microsoft::WRL::ComPtr;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@
|
|||
|
||||
#include <directx/d3d12sdklayers.h>
|
||||
|
||||
#include <dxguids/dxguids.h>
|
||||
|
||||
static const struct debug_named_value
|
||||
debug_options[] = {
|
||||
{ "verbose", D3D12_DEBUG_VERBOSE, NULL },
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue