ilo: let shaders determine surface counts

When a shader needs N surfaces, we should upload N surfaces and not depend on
how many are bound.  This commit is larger than it should be because we did
not export how many surfaces a surface uses before.

Signed-off-by: Chia-I Wu <[email protected]>

1 files changed, 11 insertions, 0 deletions

diff --git a/src/gallium/drivers/ilo/ilo_shader.h b/src/gallium/drivers/ilo/ilo_shader.h
index 77deee95ef0..c66513e27e0 100644
--- a/src/gallium/drivers/ilo/ilo_shader.h
+++ b/src/gallium/drivers/ilo/ilo_shader.h
@@ -38,6 +38,12 @@ enum ilo_kernel_param {
    ILO_KERNEL_SKIP_CBUF0_UPLOAD,
    ILO_KERNEL_PCB_CBUF0_SIZE,
 
+   ILO_KERNEL_SURFACE_TOTAL_COUNT,
+   ILO_KERNEL_SURFACE_TEX_BASE,
+   ILO_KERNEL_SURFACE_TEX_COUNT,
+   ILO_KERNEL_SURFACE_CONST_BASE,
+   ILO_KERNEL_SURFACE_CONST_COUNT,
+
    ILO_KERNEL_VS_INPUT_INSTANCEID,
    ILO_KERNEL_VS_INPUT_VERTEXID,
    ILO_KERNEL_VS_INPUT_EDGEFLAG,
@@ -47,9 +53,12 @@ enum ilo_kernel_param {
    ILO_KERNEL_VS_GEN6_SO_POINT_OFFSET,
    ILO_KERNEL_VS_GEN6_SO_LINE_OFFSET,
    ILO_KERNEL_VS_GEN6_SO_TRI_OFFSET,
+   ILO_KERNEL_VS_GEN6_SO_SURFACE_COUNT,
 
    ILO_KERNEL_GS_DISCARD_ADJACENCY,
    ILO_KERNEL_GS_GEN6_SVBI_POST_INC,
+   ILO_KERNEL_GS_GEN6_SURFACE_SO_BASE,
+   ILO_KERNEL_GS_GEN6_SURFACE_SO_COUNT,
 
    ILO_KERNEL_FS_INPUT_Z,
    ILO_KERNEL_FS_INPUT_W,
@@ -57,6 +66,8 @@ enum ilo_kernel_param {
    ILO_KERNEL_FS_USE_KILL,
    ILO_KERNEL_FS_BARYCENTRIC_INTERPOLATIONS,
    ILO_KERNEL_FS_DISPATCH_16_OFFSET,
+   ILO_KERNEL_FS_SURFACE_RT_BASE,
+   ILO_KERNEL_FS_SURFACE_RT_COUNT,
 
    ILO_KERNEL_PARAM_COUNT,
 };