freedreno/a6xx: Add generic program stateobj support for HS/DS/GS

This add generic stage state setup for HS/DS/GS to the program state
object.

Signed-off-by: Kristian H. Kristensen <hoegsberg@google.com>

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
index 6f29775d9aab868b00023a25eec190a9c4dfa8bc..d31335780639ed47bcfbc3602f1f3993b54d6c42 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
@@ -159,15 +159,23 @@ setup_config_stateobj(struct fd_ringbuffer *ring, struct fd6_program_state *stat
        OUT_PKT4(ring, REG_A6XX_HLSQ_UPDATE_CNTL, 1);
        OUT_RING(ring, 0xff);        /* XXX */
 
-       debug_assert(state->vs->constlen >= state->bs->constlen);
+       if (state->ds)
+               debug_assert(state->ds->constlen >= state->bs->constlen);
+       else
+               debug_assert(state->vs->constlen >= state->bs->constlen);
 
        OUT_PKT4(ring, REG_A6XX_HLSQ_VS_CNTL, 4);
        OUT_RING(ring, A6XX_HLSQ_VS_CNTL_CONSTLEN(align(state->vs->constlen, 4)) |
                        A6XX_HLSQ_VS_CNTL_ENABLED);
-       OUT_RING(ring, A6XX_HLSQ_HS_CNTL_CONSTLEN(0));
-       OUT_RING(ring, A6XX_HLSQ_DS_CNTL_CONSTLEN(0));
-       OUT_RING(ring, A6XX_HLSQ_GS_CNTL_CONSTLEN(0));
-
+       OUT_RING(ring, COND(state->hs,
+                                       A6XX_HLSQ_HS_CNTL_ENABLED |
+                                       A6XX_HLSQ_HS_CNTL_CONSTLEN(align(state->hs->constlen, 4))));
+       OUT_RING(ring, COND(state->ds,
+                                       A6XX_HLSQ_DS_CNTL_ENABLED |
+                                       A6XX_HLSQ_DS_CNTL_CONSTLEN(align(state->ds->constlen, 4))));
+       OUT_RING(ring, COND(state->gs,
+                                       A6XX_HLSQ_GS_CNTL_ENABLED |
+                                       A6XX_HLSQ_GS_CNTL_CONSTLEN(align(state->gs->constlen, 4))));
        OUT_PKT4(ring, REG_A6XX_HLSQ_FS_CNTL, 1);
        OUT_RING(ring, A6XX_HLSQ_FS_CNTL_CONSTLEN(align(state->fs->constlen, 4)) |
                        A6XX_HLSQ_FS_CNTL_ENABLED);
@@ -178,20 +186,32 @@ setup_config_stateobj(struct fd_ringbuffer *ring, struct fd6_program_state *stat
                        A6XX_SP_VS_CONFIG_NTEX(state->vs->num_samp) |
                        A6XX_SP_VS_CONFIG_NSAMP(state->vs->num_samp));
 
-       OUT_PKT4(ring, REG_A6XX_SP_FS_CONFIG, 1);
-       OUT_RING(ring, COND(state->fs, A6XX_SP_FS_CONFIG_ENABLED) |
-                       A6XX_SP_FS_CONFIG_NIBO(state->fs->image_mapping.num_ibo) |
-                       A6XX_SP_FS_CONFIG_NTEX(state->fs->num_samp) |
-                       A6XX_SP_FS_CONFIG_NSAMP(state->fs->num_samp));
-
        OUT_PKT4(ring, REG_A6XX_SP_HS_CONFIG, 1);
-       OUT_RING(ring, COND(false, A6XX_SP_HS_CONFIG_ENABLED));
+       OUT_RING(ring, COND(state->hs,
+                                       A6XX_SP_HS_CONFIG_ENABLED |
+                                       A6XX_SP_HS_CONFIG_NIBO(state->hs->image_mapping.num_ibo) |
+                                       A6XX_SP_HS_CONFIG_NTEX(state->hs->num_samp) |
+                                       A6XX_SP_HS_CONFIG_NSAMP(state->hs->num_samp)));
 
        OUT_PKT4(ring, REG_A6XX_SP_DS_CONFIG, 1);
-       OUT_RING(ring, COND(false, A6XX_SP_DS_CONFIG_ENABLED));
+       OUT_RING(ring, COND(state->ds,
+                                       A6XX_SP_DS_CONFIG_ENABLED |
+                                       A6XX_SP_DS_CONFIG_NIBO(state->ds->image_mapping.num_ibo) |
+                                       A6XX_SP_DS_CONFIG_NTEX(state->ds->num_samp) |
+                                       A6XX_SP_DS_CONFIG_NSAMP(state->ds->num_samp)));
 
        OUT_PKT4(ring, REG_A6XX_SP_GS_CONFIG, 1);
-       OUT_RING(ring, COND(false, A6XX_SP_GS_CONFIG_ENABLED));
+       OUT_RING(ring, COND(state->gs,
+                                       A6XX_SP_GS_CONFIG_ENABLED |
+                                       A6XX_SP_GS_CONFIG_NIBO(state->gs->image_mapping.num_ibo) |
+                                       A6XX_SP_GS_CONFIG_NTEX(state->gs->num_samp) |
+                                       A6XX_SP_GS_CONFIG_NSAMP(state->gs->num_samp)));
+
+       OUT_PKT4(ring, REG_A6XX_SP_FS_CONFIG, 1);
+       OUT_RING(ring, COND(state->fs, A6XX_SP_FS_CONFIG_ENABLED) |
+                       A6XX_SP_FS_CONFIG_NIBO(state->fs->image_mapping.num_ibo) |
+                       A6XX_SP_FS_CONFIG_NTEX(state->fs->num_samp) |
+                       A6XX_SP_FS_CONFIG_NSAMP(state->fs->num_samp));
 
        OUT_PKT4(ring, REG_A6XX_SP_IBO_COUNT, 1);
        OUT_RING(ring, state->fs->image_mapping.num_ibo);
@@ -225,6 +245,9 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
 
        static const struct ir3_shader_variant dummy_fs = {0};
        const struct ir3_shader_variant *vs = binning_pass ? state->bs : state->vs;
+       const struct ir3_shader_variant *hs = state->hs;
+       const struct ir3_shader_variant *ds = state->ds;
+       const struct ir3_shader_variant *gs = state->gs;
        const struct ir3_shader_variant *fs = binning_pass ? &dummy_fs : state->fs;
 
        bool sample_shading = fs->per_samp | key->sample_shading;
@@ -548,6 +571,16 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
        OUT_RING(ring, COND(fragz, A6XX_GRAS_SU_DEPTH_PLANE_CNTL_FRAG_WRITES_Z));
 
        ir3_emit_immediates(screen, vs, ring);
+
+       if (hs) {
+               ir3_emit_immediates(screen, hs, ring);
+               ir3_emit_immediates(screen, ds, ring);
+       }
+
+       if (gs) {
+               ir3_emit_immediates(screen, gs, ring);
+       }
+
        if (!binning_pass)
                ir3_emit_immediates(screen, fs, ring);
 }
@@ -650,6 +683,9 @@ fd6_program_emit(struct fd_ringbuffer *ring, struct fd6_emit *emit)
 static struct ir3_program_state *
 fd6_program_create(void *data, struct ir3_shader_variant *bs,
                struct ir3_shader_variant *vs,
+               struct ir3_shader_variant *hs,
+               struct ir3_shader_variant *ds,
+               struct ir3_shader_variant *gs,
                struct ir3_shader_variant *fs,
                const struct ir3_shader_key *key)
 {
@@ -662,16 +698,21 @@ fd6_program_create(void *data, struct ir3_shader_variant *bs,
         */
        state->bs = vs->shader->stream_output.num_outputs ? vs : bs;
        state->vs = vs;
+       state->hs = hs;
+       state->ds = ds;
+       state->gs = gs;
        state->fs = fs;
        state->config_stateobj = fd_ringbuffer_new_object(ctx->pipe, 0x1000);
        state->binning_stateobj = fd_ringbuffer_new_object(ctx->pipe, 0x1000);
        state->stateobj = fd_ringbuffer_new_object(ctx->pipe, 0x1000);
 
 #ifdef DEBUG
-       for (unsigned i = 0; i < bs->inputs_count; i++) {
-               if (vs->inputs[i].sysval)
-                       continue;
-               debug_assert(bs->inputs[i].regid == vs->inputs[i].regid);
+       if (!ds) {
+               for (unsigned i = 0; i < bs->inputs_count; i++) {
+                       if (vs->inputs[i].sysval)
+                               continue;
+                       debug_assert(bs->inputs[i].regid == vs->inputs[i].regid);
+               }
        }
 #endif
 
@@ -738,6 +779,15 @@ fd6_prog_init(struct pipe_context *pctx)
        pctx->create_vs_state = fd6_shader_state_create;
        pctx->delete_vs_state = fd6_shader_state_delete;
 
+       pctx->create_tcs_state = fd6_shader_state_create;
+       pctx->delete_tcs_state = fd6_shader_state_delete;
+
+       pctx->create_tes_state = fd6_shader_state_create;
+       pctx->delete_tes_state = fd6_shader_state_delete;
+
+       pctx->create_gs_state = fd6_shader_state_create;
+       pctx->delete_gs_state = fd6_shader_state_delete;
+
        pctx->create_fs_state = fd6_shader_state_create;
        pctx->delete_fs_state = fd6_shader_state_delete;
 

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.h b/src/gallium/drivers/freedreno/a6xx/fd6_program.h
index 76ef726b40ea25d4e879aba1919274a814326364..501b06cefd2262e0dfb91ef8bea44aeda06910fe 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.h
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.h
@@ -47,6 +47,9 @@ struct fd6_program_state {
        struct ir3_program_state base;
        struct ir3_shader_variant *bs;     /* binning pass vs */
        struct ir3_shader_variant *vs;
+       struct ir3_shader_variant *hs;
+       struct ir3_shader_variant *ds;
+       struct ir3_shader_variant *gs;
        struct ir3_shader_variant *fs;
        struct fd_ringbuffer *config_stateobj;
        struct fd_ringbuffer *binning_stateobj;

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cache.c b/src/gallium/drivers/freedreno/ir3/ir3_cache.c
index 8e7070a727d6d37f32cbc2fdc1eda892949fbd7e..e387291a92a823d3abf24e5916610c8c251272b3 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_cache.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_cache.c
@@ -102,7 +102,7 @@ ir3_cache_lookup(struct ir3_cache *cache, const struct ir3_cache_key *key,
        }
 
        struct ir3_program_state *state =
-               cache->funcs->create_state(cache->data, bs, vs, fs, &key->key);
+               cache->funcs->create_state(cache->data, bs, vs, NULL, NULL, NULL, fs, &key->key);
        state->key = *key;
 
        /* NOTE: uses copy of key in state obj, because pointer passed by caller

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cache.h b/src/gallium/drivers/freedreno/ir3/ir3_cache.h
index 73d555e92ceac50eadd44fcfccb4ea07fea3a2f0..9343b535b5715862f39688f3ea35f95bb17787b4 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_cache.h
+++ b/src/gallium/drivers/freedreno/ir3/ir3_cache.h
@@ -53,6 +53,9 @@ struct ir3_cache_funcs {
        struct ir3_program_state *(*create_state)(void *data,
                        struct ir3_shader_variant *bs,  /* binning pass vs */
                        struct ir3_shader_variant *vs,
+                       struct ir3_shader_variant *hs,
+                       struct ir3_shader_variant *ds,
+                       struct ir3_shader_variant *gs,
                        struct ir3_shader_variant *fs,
                        const struct ir3_shader_key *key);
        void (*destroy_state)(void *data, struct ir3_program_state *state);