svga: fix shader type after ntt
authorCharmaine Lee <charmainel@vmware.com>
Wed, 14 Jun 2023 00:14:41 +0000 (03:14 +0300)
committerMarge Bot <emma+marge@anholt.net>
Wed, 14 Jun 2023 03:43:27 +0000 (03:43 +0000)
Set shader type to TGSI after ntt. Fixes assert in svga_create_shader.

Fixes: 0ac95418048 ("gallium: Drop PIPE_SHADER_CAP_PREFERRED_IR")

Reviewed-by: Neha Bhende <bhenden@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23638>

src/gallium/drivers/svga/svga_shader.c

index 6643e2d..cac90c8 100644 (file)
@@ -923,19 +923,13 @@ svga_create_shader(struct pipe_context *pipe,
       return NULL;
 
    shader->id = svga->debug.shader_id++;
-   shader->type = templ->type;
    shader->stage = stage;
 
    shader->tokens = pipe_shader_state_to_tgsi_tokens(pipe->screen, templ);
+   shader->type = PIPE_SHADER_IR_TGSI;
 
-   if (shader->type == PIPE_SHADER_IR_TGSI) {
-      /* Collect basic info of the shader */
-      svga_tgsi_scan_shader(shader);
-   }
-   else {
-      debug_printf("Unexpected nir shader\n");
-      assert(0);
-   }
+   /* Collect basic info of the shader */
+   svga_tgsi_scan_shader(shader);
 
    /* check for any stream output declarations */
    if (templ->stream_output.num_outputs) {