OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/common: add directory prefix to intel_gem.h include

Browse Source 
Otherwise common/intel_gem.h may get included instead of
common/i915/intel_gem.h when building in a different directory.

Fixes: e050a00b9f ("intel/common: Move i915 files to i915 folder")
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26784>
(cherry picked from commit fbb9ce0140)
This commit is contained in:
Jonathan Gray
2023-12-19 18:27:16 +11:00
committed by Eric Engestrom
parent 676fd7a287
commit fa0f07c5e1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -294,7 +294,7 @@
"description": "intel/common: add directory prefix to intel_gem.h include", "description": "intel/common: add directory prefix to intel_gem.h include",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "e050a00b9f4d057e93f61f79019b5cf8bcd04e49", "because_sha": "e050a00b9f4d057e93f61f79019b5cf8bcd04e49",
"notes": null "notes": null

2
src/intel/common/i915/intel_engine.c
View File

@@ -25,7 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "intel_gem.h" #include "i915/intel_gem.h"
static enum intel_engine_class static enum intel_engine_class
i915_engine_class_to_intel(enum drm_i915_gem_engine_class i915) i915_engine_class_to_intel(enum drm_i915_gem_engine_class i915)