diff options
| author | Jason Ekstrand <[email protected]> | 2017-06-12 16:02:00 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-07-12 21:15:46 -0700 |
| commit | 285242e6747e9ca06489617e008ef71f3cbaf056 (patch) | |
| tree | 30ca269dc0231584f067115fbc6087eadeb14ac7 | |
| parent | 06c95f1282bcad14f44aff42c21a7ae46b435cf9 (diff) | |
i965: Add an isl_device to intel_screen
Reviewed-by: Topi Pohjolainen <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.h | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 5c57b864c29..d8f187ff7e7 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -853,7 +853,7 @@ brwCreateContext(gl_api api, brw->must_use_separate_stencil = devinfo->must_use_separate_stencil; brw->has_swizzling = screen->hw_has_swizzling; - isl_device_init(&brw->isl_dev, devinfo, screen->hw_has_swizzling); + brw->isl_dev = screen->isl_dev; brw->vs.base.stage = MESA_SHADER_VERTEX; brw->tcs.base.stage = MESA_SHADER_TESS_CTRL; diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index c75f2125d4b..6c23834b2f4 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -2121,6 +2121,9 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen) screen->hw_has_swizzling = intel_detect_swizzling(screen); screen->hw_has_timestamp = intel_detect_timestamp(screen); + isl_device_init(&screen->isl_dev, &screen->devinfo, + screen->hw_has_swizzling); + /* GENs prior to 8 do not support EU/Subslice info */ if (devinfo->gen >= 8) { intel_detect_sseu(screen); diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/intel_screen.h index f78b3e8f743..0980c8f561b 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.h +++ b/src/mesa/drivers/dri/i965/intel_screen.h @@ -38,6 +38,8 @@ #include "i915_drm.h" #include "xmlconfig.h" +#include "isl/isl.h" + #ifdef __cplusplus extern "C" { #endif @@ -60,6 +62,8 @@ struct intel_screen int hw_has_timestamp; + struct isl_device isl_dev; + /** * Does the kernel support context reset notifications? */ |