diff options
| author | Jordan Justen <[email protected]> | 2018-02-26 15:39:59 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2018-03-05 09:47:37 -0800 |
| commit | 272bef0601a1bdb5292771aefc8d62fcbdf4c47f (patch) | |
| tree | c94ae513a916ed81151067da24260bbb424e5deb /src/intel/isl | |
| parent | 9a0d7bb48c93e7d0109751469a8b32c94e85bc24 (diff) | |
intel: Split gen_device_info out into libintel_dev
Split out the device info so isl doesn't depend on intel/common. Now
it will depend on the new intel/dev device info lib.
This will allow the decoder in intel/common to use isl, allowing us to
apply Ken's patch that removes the genxml duplication of surface
formats.
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
Diffstat (limited to 'src/intel/isl')
| -rw-r--r-- | src/intel/isl/isl_drm.c | 2 | ||||
| -rw-r--r-- | src/intel/isl/isl_format.c | 2 | ||||
| -rw-r--r-- | src/intel/isl/isl_priv.h | 2 | ||||
| -rw-r--r-- | src/intel/isl/meson.build | 2 | ||||
| -rw-r--r-- | src/intel/isl/tests/isl_surf_get_image_offset_test.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c index 31895e15e16..e16d7b63917 100644 --- a/src/intel/isl/isl_drm.c +++ b/src/intel/isl/isl_drm.c @@ -28,7 +28,7 @@ #include <i915_drm.h> #include "isl.h" -#include "common/gen_device_info.h" +#include "dev/gen_device_info.h" uint32_t isl_tiling_to_i915_tiling(enum isl_tiling tiling) diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c index 03c591071b6..a5bbdbceb1a 100644 --- a/src/intel/isl/isl_format.c +++ b/src/intel/isl/isl_format.c @@ -24,7 +24,7 @@ #include <assert.h> #include "isl.h" -#include "common/gen_device_info.h" +#include "dev/gen_device_info.h" struct surface_format_info { bool exists; diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h index b86167bb3af..871518409ee 100644 --- a/src/intel/isl/isl_priv.h +++ b/src/intel/isl/isl_priv.h @@ -27,7 +27,7 @@ #include <assert.h> #include <strings.h> -#include "common/gen_device_info.h" +#include "dev/gen_device_info.h" #include "util/macros.h" #include "isl.h" diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 36b8b8ffa20..73a8837f2ad 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -95,7 +95,7 @@ if with_tests 'tests/isl_surf_get_image_offset_test.c', dependencies : dep_m, include_directories : [inc_common, inc_intel], - link_with : [libisl, libintel_common], + link_with : [libisl, libintel_dev], ) ) endif diff --git a/src/intel/isl/tests/isl_surf_get_image_offset_test.c b/src/intel/isl/tests/isl_surf_get_image_offset_test.c index 05fd79f3a94..16c80c312e9 100644 --- a/src/intel/isl/tests/isl_surf_get_image_offset_test.c +++ b/src/intel/isl/tests/isl_surf_get_image_offset_test.c @@ -26,7 +26,7 @@ #include <stdio.h> #include <stdlib.h> -#include "common/gen_device_info.h" +#include "dev/gen_device_info.h" #include "isl/isl.h" #include "isl/isl_priv.h" |