diff --git a/src/gallium/drivers/r300/compiler/nir_to_rc.c b/src/gallium/drivers/r300/compiler/nir_to_rc.c index 41c5673c906..3b8f5b214de 100644 --- a/src/gallium/drivers/r300/compiler/nir_to_rc.c +++ b/src/gallium/drivers/r300/compiler/nir_to_rc.c @@ -2843,56 +2843,3 @@ const void *nir_to_rc_options(struct nir_shader *s, return tgsi_tokens; } - -static const nir_shader_compiler_options nir_to_rc_compiler_options = { - .fdot_replicates = true, - .fuse_ffma32 = true, - .fuse_ffma64 = true, - .lower_extract_byte = true, - .lower_extract_word = true, - .lower_insert_byte = true, - .lower_insert_word = true, - .lower_fdph = true, - .lower_flrp64 = true, - .lower_fmod = true, - .lower_rotate = true, - .lower_uniforms_to_ubo = true, - .lower_uadd_carry = true, - .lower_usub_borrow = true, - .lower_uadd_sat = true, - .lower_usub_sat = true, - .lower_vector_cmp = true, - .lower_int64_options = nir_lower_imul_2x32_64, - .use_interpolated_input_intrinsics = true, - - /* TGSI doesn't have a semantic for local or global index, just local and - * workgroup id. - */ - .lower_cs_local_index_to_id = true, -}; - -/* Returns a default compiler options for drivers with only nir-to-tgsi-based - * NIR support. - */ -const void * -nir_to_rc_get_compiler_options(struct pipe_screen *pscreen, - enum pipe_shader_ir ir, - unsigned shader) -{ - assert(ir == PIPE_SHADER_IR_NIR); - return &nir_to_rc_compiler_options; -} - -/** Helper for getting TGSI tokens to store for a pipe_shader_state CSO. */ -const void * -r300_pipe_shader_state_to_tgsi_tokens(struct pipe_screen *screen, - const struct pipe_shader_state *cso) -{ - if (cso->type == PIPE_SHADER_IR_NIR) { - return nir_to_rc((nir_shader *)cso->ir.nir, screen); - } else { - assert(cso->type == PIPE_SHADER_IR_TGSI); - /* we need to keep a local copy of the tokens */ - return tgsi_dup_tokens(cso->tokens); - } -} diff --git a/src/gallium/drivers/r300/compiler/nir_to_rc.h b/src/gallium/drivers/r300/compiler/nir_to_rc.h index 0df5cd9a74e..ebbe87770af 100644 --- a/src/gallium/drivers/r300/compiler/nir_to_rc.h +++ b/src/gallium/drivers/r300/compiler/nir_to_rc.h @@ -47,13 +47,4 @@ const void *nir_to_rc_options(struct nir_shader *s, struct pipe_screen *screen, const struct nir_to_rc_options *ntr_options); -const void * -nir_to_rc_get_compiler_options(struct pipe_screen *pscreen, - enum pipe_shader_ir ir, - unsigned shader); - -const void * -r300_pipe_shader_state_to_tgsi_tokens(struct pipe_screen *screen, - const struct pipe_shader_state *cso); - #endif /* NIR_TO_RC_H */