Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve ambiguous include order for files of the same names for differen Gens

Browse Source 
Change-Id: I26cfc73819884e967d47ef4cb95e2f3f4835ad4d
This commit is contained in:
Zdanowicz, Zbigniew
2018-01-17 17:26:49 +01:00
committed by sys_ocldev
parent e923c2211b
commit fa43e42887
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/gen8/hw_cmds.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Intel Corporation * Copyright (c) 2017 - 2018, Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -31,7 +31,7 @@
struct BdwParse; struct BdwParse;
namespace OCLRT { namespace OCLRT {
struct GEN8 { struct GEN8 {
#include "hw_cmds_generated.h" #include "runtime/gen8/hw_cmds_generated.h"
typedef struct tagMEDIA_SURFACE_STATE { typedef struct tagMEDIA_SURFACE_STATE {
union tagTheStructure { union tagTheStructure {
struct tagCommon { struct tagCommon {

6
runtime/gen9/hw_cmds_base.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Intel Corporation * Copyright (c) 2017 - 2018, Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -32,8 +32,8 @@ struct SklParse;
namespace OCLRT { namespace OCLRT {
struct GEN9 { struct GEN9 {
#include "hw_cmds_generated_patched.h" #include "runtime/gen9/hw_cmds_generated_patched.h"
#include "hw_cmds_generated.h" #include "runtime/gen9/hw_cmds_generated.h"
}; };
struct SKLFamily : public GEN9 { struct SKLFamily : public GEN9 {

4
runtime/gen9/hw_cmds_bxt.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Intel Corporation * Copyright (c) 2017 - 2018, Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
#include "hw_cmds_base.h" #include "runtime/gen9/hw_cmds_base.h"
namespace OCLRT { namespace OCLRT {

2
runtime/gen9/hw_cmds_cfl.h
View File

@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
#include "hw_cmds_base.h" #include "runtime/gen9/hw_cmds_base.h"
namespace OCLRT { namespace OCLRT {

4
runtime/gen9/hw_cmds_glk.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Intel Corporation * Copyright (c) 2017 - 2018, Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
#include "hw_cmds_base.h" #include "runtime/gen9/hw_cmds_base.h"
namespace OCLRT { namespace OCLRT {

4
runtime/gen9/hw_cmds_kbl.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Intel Corporation * Copyright (c) 2017 - 2018, Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
#include "hw_cmds_base.h" #include "runtime/gen9/hw_cmds_base.h"
namespace OCLRT { namespace OCLRT {

4
runtime/gen9/hw_cmds_skl.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Intel Corporation * Copyright (c) 2017 - 2018, Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
#include "hw_cmds_base.h" #include "runtime/gen9/hw_cmds_base.h"
namespace OCLRT { namespace OCLRT {