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:
Jesse Natalie 2020-12-08 10:02:35 -08:00 committed by Marge Bot
parent da9b6a21f4
commit e1e05ad772
11 changed files with 18 additions and 0 deletions

View file

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

View file

@ -34,6 +34,7 @@
#include "util/u_memory.h"
#include <directx/d3d12.h>
#include <dxguids/dxguids.h>
struct d3d12_bufmgr {
struct pb_manager base;

View file

@ -42,6 +42,8 @@
#include "util/u_simple_shaders.h"
#include <directx/d3d12.h>
#include <dxguids/dxguids.h>
#include <dxcapi.h>
#include <wrl.h>

View file

@ -45,6 +45,8 @@
#include "D3D12ResourceState.h"
#include <dxguids/dxguids.h>
extern "C" {
#include "indices/u_primconvert.h"
}

View file

@ -33,6 +33,7 @@
#include "util/u_memory.h"
#include <directx/d3d12.h>
#include <dxguids/dxguids.h>
struct d3d12_descriptor_pool {
ID3D12Device *dev;

View file

@ -28,6 +28,7 @@
#include "util/u_memory.h"
#include <directx/dxcore.h>
#include <dxguids/dxguids.h>
static IDXCoreAdapterFactory *
get_dxcore_factory()

View file

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

View file

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

View file

@ -39,6 +39,7 @@
#include "frontend/sw_winsys.h"
#include <directx/d3d12.h>
#include <dxguids/dxguids.h>
#include <memory>
static bool

View file

@ -27,6 +27,8 @@
#include "util/u_memory.h"
#include <dxguids/dxguids.h>
#include <wrl.h>
using Microsoft::WRL::ComPtr;

View file

@ -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 },