From 3fecb1c44d9225b3d68288041541b5c9a92650f9 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 18 Aug 2018 23:58:54 -0700 Subject: [PATCH] iris: Move iris_sampler_view declaration to iris_resource.h We'll need this for resolve tracking. There's also no genxml stuff here --- src/gallium/drivers/iris/iris_resource.h | 18 ++++++++++++++++++ src/gallium/drivers/iris/iris_state.c | 17 ----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.h b/src/gallium/drivers/iris/iris_resource.h index 3fde5c13a96..979e17c3e5d 100644 --- a/src/gallium/drivers/iris/iris_resource.h +++ b/src/gallium/drivers/iris/iris_resource.h @@ -53,6 +53,24 @@ struct iris_state_ref { }; /** + * Gallium CSO for sampler views (texture views). + * + * In addition to the normal pipe_resource, this adds an ISL view + * which may reinterpret the format or restrict levels/layers. + * + * These can also be linear texture buffers. + */ +struct iris_sampler_view { + struct pipe_sampler_view base; + struct isl_view view; + + /** The resource (BO) holding our SURFACE_STATE. */ + struct iris_state_ref surface_state; +}; + +/** + * Gallium CSO for surfaces (framebuffer attachments). + * * A view of a surface that can be bound to a color render target or * depth/stencil attachment. */ diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index f6a06bb7926..ff81ffa9f78 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -1169,23 +1169,6 @@ iris_bind_sampler_states(struct pipe_context *ctx, ice->state.dirty |= IRIS_DIRTY_SAMPLER_STATES_VS << stage; } -/** - * Gallium CSO for sampler views (texture views). - * - * In addition to the normal pipe_resource, this adds an ISL view - * which may reinterpret the format or restrict levels/layers. - * - * These can also be linear texture buffers. - */ -struct iris_sampler_view { - // XXX: just store the resource, not the rest of this - struct pipe_sampler_view base; - struct isl_view view; - - /** The resource (BO) holding our SURFACE_STATE. */ - struct iris_state_ref surface_state; -}; - /** * Convert an swizzle enumeration (i.e. PIPE_SWIZZLE_X) to one of the HW's * "Shader Channel Select" enumerations (i.e. SCS_RED). The mappings are -- 2.30.2