diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.c b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
index 4f810e13cbf..5f8eb665ffc 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump_state.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
@@ -1164,7 +1164,6 @@ void trace_dump_grid_info(const struct pipe_grid_info *state)
 
    trace_dump_struct_begin("pipe_grid_info");
 
-   trace_dump_member(uint, state, pc);
    trace_dump_member(ptr, state, input);
    trace_dump_member(uint, state, variable_shared_mem);
 
diff --git a/src/gallium/auxiliary/util/u_dump_state.c b/src/gallium/auxiliary/util/u_dump_state.c
index 0efcca8372e..5dde46e6f8d 100644
--- a/src/gallium/auxiliary/util/u_dump_state.c
+++ b/src/gallium/auxiliary/util/u_dump_state.c
@@ -976,7 +976,6 @@ void util_dump_grid_info(FILE *stream, const struct pipe_grid_info *state)
 
    util_dump_struct_begin(stream, "pipe_grid_info");
 
-   util_dump_member(stream, uint, state, pc);
    util_dump_member(stream, ptr, state, input);
    util_dump_member(stream, uint, state, work_dim);
 
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
index 52a984c2a49..bb296e63143 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
@@ -268,7 +268,6 @@ nv50_hw_sm_end_query(struct nv50_context *nv50, struct nv50_hw_query *hq)
       info.block[i] = block[i];
       info.grid[i] = grid[i];
    }
-   info.pc = 0;
    nv50_launch_grid_with_input(pipe, &info, input, 8);
    pipe->bind_compute_state(pipe, old);
 
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
index 25b1d048471..182f0d42f5b 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
@@ -2584,7 +2584,6 @@ nvc0_hw_sm_end_query(struct nvc0_context *nvc0, struct nvc0_hw_query *hq)
       info.block[i] = block[i];
       info.grid[i] = grid[i];
    }
-   info.pc = 0;
    pipe->launch_grid(pipe, &info);
    pipe->bind_compute_state(pipe, old);
 
diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 098e14d0b6b..67465b2374c 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -467,7 +467,7 @@ static void evergreen_launch_grid(struct pipe_context *ctx,
 {
 	struct r600_context *rctx = (struct r600_context *)ctx;
 
-	COMPUTE_DBG(rctx->screen, "*** evergreen_launch_grid: pc = %u\n", info->pc);
+	COMPUTE_DBG(rctx->screen, "*** evergreen_launch_grid\n");
 
 	compute_emit_cs(rctx, info);
 }
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index c400d8c09f2..90f13639d27 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -156,10 +156,6 @@ static void *si_create_compute_state(struct pipe_context *ctx, const struct pipe
 {
    struct si_context *sctx = (struct si_context *)ctx;
    struct si_screen *sscreen = (struct si_screen *)ctx->screen;
-
-   if (cso->ir_type == PIPE_SHADER_IR_NATIVE)
-      return NULL;
-
    struct si_compute *program = CALLOC_STRUCT(si_compute);
    struct si_shader_selector *sel = &program->sel;
 
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index b8afd6acc5b..0f1133bba47 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -750,7 +750,6 @@ enum pipe_endian
 enum pipe_shader_ir
 {
    PIPE_SHADER_IR_TGSI = 0,
-   PIPE_SHADER_IR_NATIVE,
    PIPE_SHADER_IR_NIR,
 };
 
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 7752b63780b..a41dd29c92d 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -302,7 +302,6 @@ struct pipe_shader_state
    /* TODO move tokens into union. */
    const struct tgsi_token *tokens;
    union {
-      void *native;
       struct nir_shader *nir;
    } ir;
    struct pipe_stream_output_info stream_output;
@@ -941,13 +940,6 @@ struct pipe_blit_info
  */
 struct pipe_grid_info
 {
-   /**
-    * For drivers that use PIPE_SHADER_IR_NATIVE as their preferred IR, this
-    * value will be the index of the kernel in the opencl.kernels metadata
-    * list.
-    */
-   uint32_t pc;
-
    /**
     * Will be used to initialize the INPUT resource, and it should point to a
     * buffer of at least pipe_compute_state::req_input_mem bytes.