From 3afe30e64be7f4686398f826389159d87d8ae096 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 24 Sep 2014 13:11:25 +0800 Subject: ilo: remove struct ilo_3d Move members of ilo_3d that still make sense to ilo_context. With ilo_3d gone, rename functions whose names begin with ilo_3d to something more appropriate. Signed-off-by: Chia-I Wu --- src/gallium/drivers/ilo/ilo_context.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers/ilo/ilo_context.h') diff --git a/src/gallium/drivers/ilo/ilo_context.h b/src/gallium/drivers/ilo/ilo_context.h index ce6050dee19..4c8c6ff6840 100644 --- a/src/gallium/drivers/ilo/ilo_context.h +++ b/src/gallium/drivers/ilo/ilo_context.h @@ -32,14 +32,15 @@ #include "util/u_slab.h" #include "ilo_common.h" +#include "ilo_cp.h" +#include "ilo_draw.h" #include "ilo_state.h" struct u_upload_mgr; - struct intel_winsys; -struct ilo_3d; + +struct ilo_3d_pipeline; struct ilo_blitter; -struct ilo_cp; struct ilo_screen; struct ilo_shader_cache; @@ -54,8 +55,8 @@ struct ilo_context { struct ilo_cp *cp; struct ilo_shader_cache *shader_cache; - struct ilo_3d *hw3d; struct ilo_blitter *blitter; + struct ilo_3d_pipeline *pipeline; struct u_upload_mgr *uploader; @@ -66,6 +67,11 @@ struct ilo_context { bool condition; unsigned mode; } render_condition; + + struct { + struct ilo_cp_owner cp_owner; + struct list_head queries; + } draw; }; static inline struct ilo_context * -- cgit v1.2.3