aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/ilo/ilo_shader.c
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2014-10-06 12:42:56 +0800
committerChia-I Wu <[email protected]>2014-10-06 15:10:30 +0800
commitf358462640beb7660b9ce2a31d5367fc33421ee1 (patch)
tree409abd7b13805c8ca8b4d8aec76fedf81ed65af0 /src/gallium/drivers/ilo/ilo_shader.c
parentca824e69403a32144328d1fb7987d0537e88ee04 (diff)
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]>
Diffstat (limited to 'src/gallium/drivers/ilo/ilo_shader.c')
-rw-r--r--src/gallium/drivers/ilo/ilo_shader.c39
1 files changed, 39 insertions, 0 deletions
diff --git a/src/gallium/drivers/ilo/ilo_shader.c b/src/gallium/drivers/ilo/ilo_shader.c
index fdbd2b88ea9..f4203aa9756 100644
--- a/src/gallium/drivers/ilo/ilo_shader.c
+++ b/src/gallium/drivers/ilo/ilo_shader.c
@@ -385,6 +385,14 @@ ilo_shader_info_parse_decl(struct ilo_shader_info *info,
decl->Semantic.Name == TGSI_SEMANTIC_EDGEFLAG)
info->edgeflag_out = decl->Range.First;
break;
+ case TGSI_FILE_CONSTANT:
+ {
+ const int idx = (decl->Declaration.Dimension) ?
+ decl->Dim.Index2D : 0;
+ if (info->constant_buffer_count <= idx)
+ info->constant_buffer_count = idx + 1;
+ }
+ break;
case TGSI_FILE_SYSTEM_VALUE:
if (decl->Declaration.Semantic &&
decl->Semantic.Name == TGSI_SEMANTIC_INSTANCEID)
@@ -1013,6 +1021,22 @@ ilo_shader_get_kernel_param(const struct ilo_shader_state *shader,
val = kernel->pcb.cbuf0_size;
break;
+ case ILO_KERNEL_SURFACE_TOTAL_COUNT:
+ val = kernel->bt.total_count;
+ break;
+ case ILO_KERNEL_SURFACE_TEX_BASE:
+ val = kernel->bt.tex_base;
+ break;
+ case ILO_KERNEL_SURFACE_TEX_COUNT:
+ val = kernel->bt.tex_count;
+ break;
+ case ILO_KERNEL_SURFACE_CONST_BASE:
+ val = kernel->bt.const_base;
+ break;
+ case ILO_KERNEL_SURFACE_CONST_COUNT:
+ val = kernel->bt.const_count;
+ break;
+
case ILO_KERNEL_VS_INPUT_INSTANCEID:
val = shader->info.has_instanceid;
break;
@@ -1047,6 +1071,9 @@ ilo_shader_get_kernel_param(const struct ilo_shader_state *shader,
case ILO_KERNEL_VS_GEN6_SO_TRI_OFFSET:
val = kernel->gs_offsets[2];
break;
+ case ILO_KERNEL_VS_GEN6_SO_SURFACE_COUNT:
+ val = kernel->gs_bt_so_count;
+ break;
case ILO_KERNEL_GS_DISCARD_ADJACENCY:
val = kernel->in.discard_adj;
@@ -1054,6 +1081,12 @@ ilo_shader_get_kernel_param(const struct ilo_shader_state *shader,
case ILO_KERNEL_GS_GEN6_SVBI_POST_INC:
val = kernel->svbi_post_inc;
break;
+ case ILO_KERNEL_GS_GEN6_SURFACE_SO_BASE:
+ val = kernel->bt.gen6_so_base;
+ break;
+ case ILO_KERNEL_GS_GEN6_SURFACE_SO_COUNT:
+ val = kernel->bt.gen6_so_count;
+ break;
case ILO_KERNEL_FS_INPUT_Z:
case ILO_KERNEL_FS_INPUT_W:
@@ -1071,6 +1104,12 @@ ilo_shader_get_kernel_param(const struct ilo_shader_state *shader,
case ILO_KERNEL_FS_DISPATCH_16_OFFSET:
val = 0;
break;
+ case ILO_KERNEL_FS_SURFACE_RT_BASE:
+ val = kernel->bt.rt_base;
+ break;
+ case ILO_KERNEL_FS_SURFACE_RT_COUNT:
+ val = kernel->bt.rt_count;
+ break;
default:
assert(!"unknown kernel parameter");