diff options
| author | Jason Ekstrand <[email protected]> | 2017-02-28 18:49:45 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-03-01 16:14:02 -0800 |
| commit | 1c318af743db922a161388e9d1b02c7915886bb3 (patch) | |
| tree | 67354aaa959ca0cd6ff54778c24ab1a75fc06964 | |
| parent | fbb91719681147c9107fb7136950635cba23858a (diff) | |
i965: Move a bunch of pre-compile and link stuff to brw_program.h
It's all GL-specific and brw_program.h is not part of i965_compiler.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.h | 15 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.h | 14 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_program.h b/src/mesa/drivers/dri/i965/brw_program.h index 3c12c4a614a..68cdd2e2f6e 100644 --- a/src/mesa/drivers/dri/i965/brw_program.h +++ b/src/mesa/drivers/dri/i965/brw_program.h @@ -68,6 +68,21 @@ brw_stage_prog_data_free(const void *prog_data); void brw_dump_arb_asm(const char *stage, struct gl_program *prog); +bool brw_vs_precompile(struct gl_context *ctx, struct gl_program *prog); +bool brw_tcs_precompile(struct gl_context *ctx, + struct gl_shader_program *shader_prog, + struct gl_program *prog); +bool brw_tes_precompile(struct gl_context *ctx, + struct gl_shader_program *shader_prog, + struct gl_program *prog); +bool brw_gs_precompile(struct gl_context *ctx, struct gl_program *prog); +bool brw_fs_precompile(struct gl_context *ctx, struct gl_program *prog); +bool brw_cs_precompile(struct gl_context *ctx, struct gl_program *prog); + +GLboolean brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog); +struct gl_linked_shader *brw_new_shader(gl_shader_stage stage); + + void brw_upload_tcs_prog(struct brw_context *brw); void brw_tcs_populate_key(struct brw_context *brw, struct brw_tcs_prog_key *key); diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index da2d28ed3e9..939a45aa7ef 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -287,20 +287,6 @@ struct brw_gs_compile unsigned control_data_header_size_bits; }; -bool brw_vs_precompile(struct gl_context *ctx, struct gl_program *prog); -bool brw_tcs_precompile(struct gl_context *ctx, - struct gl_shader_program *shader_prog, - struct gl_program *prog); -bool brw_tes_precompile(struct gl_context *ctx, - struct gl_shader_program *shader_prog, - struct gl_program *prog); -bool brw_gs_precompile(struct gl_context *ctx, struct gl_program *prog); -bool brw_fs_precompile(struct gl_context *ctx, struct gl_program *prog); -bool brw_cs_precompile(struct gl_context *ctx, struct gl_program *prog); - -GLboolean brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog); -struct gl_linked_shader *brw_new_shader(gl_shader_stage stage); - unsigned get_atomic_counter_op(nir_intrinsic_op op); #ifdef __cplusplus |