mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-02-15 19:40:30 +01:00
intel: Remove circular dependency between intel/dev and intel/common
intel/common has a build dependency on intel/dev so the later should not have any dependendies on the first. So here moving the definition of intel_engine_class to intel_device_info.h because it is used in intel_device_info struct and then including intel_device_info.h in intel_engine.h. Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25233>
This commit is contained in:
parent
6b5c446556
commit
ffca423472
4 changed files with 9 additions and 11 deletions
|
|
@ -25,17 +25,9 @@
|
|||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "intel/dev/intel_device_info.h"
|
||||
#include "intel/dev/intel_kmd.h"
|
||||
|
||||
enum intel_engine_class {
|
||||
INTEL_ENGINE_CLASS_RENDER = 0,
|
||||
INTEL_ENGINE_CLASS_COPY,
|
||||
INTEL_ENGINE_CLASS_VIDEO,
|
||||
INTEL_ENGINE_CLASS_VIDEO_ENHANCE,
|
||||
INTEL_ENGINE_CLASS_COMPUTE,
|
||||
INTEL_ENGINE_CLASS_INVALID
|
||||
};
|
||||
|
||||
struct intel_engine_class_instance {
|
||||
enum intel_engine_class engine_class;
|
||||
uint16_t engine_instance;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include "compiler/shader_enums.h"
|
||||
#include "intel_kmd.h"
|
||||
|
||||
#include "intel/common/intel_engine.h"
|
||||
#include "intel/dev/intel_wa.h"
|
||||
|
||||
#include "intel/dev/intel_device_info_gen.h"
|
||||
|
|
|
|||
|
|
@ -166,6 +166,14 @@ Enum("intel_cooperative_matrix_component_type",
|
|||
"INTEL_CMAT_UINT32",
|
||||
"INTEL_CMAT_UINT8"])
|
||||
|
||||
Enum("intel_engine_class",
|
||||
["INTEL_ENGINE_CLASS_RENDER",
|
||||
"INTEL_ENGINE_CLASS_COPY",
|
||||
"INTEL_ENGINE_CLASS_VIDEO",
|
||||
"INTEL_ENGINE_CLASS_VIDEO_ENHANCE",
|
||||
"INTEL_ENGINE_CLASS_COMPUTE",
|
||||
"INTEL_ENGINE_CLASS_INVALID"])
|
||||
|
||||
Struct("intel_cooperative_matrix_configuration",
|
||||
[Member("intel_cmat_scope", "scope",
|
||||
comment=dedent("""\
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ template = COPYRIGHT + """
|
|||
|
||||
#include "util/macros.h"
|
||||
#include "compiler/shader_enums.h"
|
||||
#include "intel/common/intel_engine.h"
|
||||
#include "intel/dev/intel_wa.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue