diff options
author | Chia-I Wu <[email protected]> | 2015-03-08 04:33:49 +0800 |
---|---|---|
committer | Chia-I Wu <[email protected]> | 2015-05-02 22:14:06 +0800 |
commit | 19351af53dfffb8543d21a58be9c9f9a52b3ba62 (patch) | |
tree | ed3cadd050d9a8723cd20d37e6210784fb9a971f /src/gallium/drivers/ilo/ilo_screen.c | |
parent | b3197fe5f4bfd3f75e6bb64c05c2709bb7985b2c (diff) |
ilo: move intel_winsys to ilo_dev_info
We want to use ilo_dev_info instead of ilo_screen in core.
Diffstat (limited to 'src/gallium/drivers/ilo/ilo_screen.c')
-rw-r--r-- | src/gallium/drivers/ilo/ilo_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c index 3be13486392..e13e056e9ed 100644 --- a/src/gallium/drivers/ilo/ilo_screen.c +++ b/src/gallium/drivers/ilo/ilo_screen.c @@ -559,7 +559,7 @@ ilo_get_timestamp(struct pipe_screen *screen) uint32_t dw[2]; } timestamp; - intel_winsys_read_reg(is->winsys, GEN6_REG_TIMESTAMP, ×tamp.val); + intel_winsys_read_reg(is->dev.winsys, GEN6_REG_TIMESTAMP, ×tamp.val); /* * From the Ivy Bridge PRM, volume 1 part 3, page 107: @@ -664,7 +664,7 @@ ilo_screen_destroy(struct pipe_screen *screen) struct ilo_screen *is = ilo_screen(screen); /* as it seems, winsys is owned by the screen */ - intel_winsys_destroy(is->winsys); + intel_winsys_destroy(is->dev.winsys); FREE(is); } @@ -820,9 +820,9 @@ ilo_screen_create(struct intel_winsys *ws) if (!is) return NULL; - is->winsys = ws; + is->dev.winsys = ws; - info = intel_winsys_get_info(is->winsys); + info = intel_winsys_get_info(is->dev.winsys); if (!init_dev(&is->dev, info)) { FREE(is); return NULL; |