diff options
| author | Jason Ekstrand <[email protected]> | 2017-02-28 18:48:23 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-03-01 16:14:02 -0800 |
| commit | 820ae39725560bc347483a66045b399c85b54bda (patch) | |
| tree | aa1486791d8c85b946bc7ee709e621ca6ef6337f | |
| parent | 760c8a1d950ddc178a6a7dc9c092790ca36e8e76 (diff) | |
i965: Move channel_expressions and vector_splitting to brw_program.h
They're GL-specific.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.h | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index d0e272bb9ee..00861ce5dad 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -484,9 +484,6 @@ private: void *mem_ctx; }; -bool brw_do_channel_expressions(struct exec_list *instructions); -bool brw_do_vector_splitting(struct exec_list *instructions); - void shuffle_32bit_load_result_to_64bit_data(const brw::fs_builder &bld, const fs_reg &dst, const fs_reg &src, diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp index 5d8998810cf..76dbc065351 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -41,6 +41,7 @@ * we do retain the vector types in that case. */ +#include "brw_program.h" #include "compiler/glsl/ir.h" #include "compiler/glsl/ir_expression_flattening.h" #include "compiler/glsl_types.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp index 5c05586f49a..ce64dc652c7 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp @@ -37,6 +37,7 @@ * behavior we want for the results of texture lookups, but probably not for */ +#include "brw_program.h" #include "main/imports.h" #include "compiler/glsl/ir.h" #include "compiler/glsl/ir_rvalue_visitor.h" diff --git a/src/mesa/drivers/dri/i965/brw_program.h b/src/mesa/drivers/dri/i965/brw_program.h index 6903ccd8412..3c12c4a614a 100644 --- a/src/mesa/drivers/dri/i965/brw_program.h +++ b/src/mesa/drivers/dri/i965/brw_program.h @@ -32,6 +32,9 @@ extern "C" { struct brw_context; +bool brw_do_channel_expressions(struct exec_list *instructions); +bool brw_do_vector_splitting(struct exec_list *instructions); + struct nir_shader *brw_create_nir(struct brw_context *brw, const struct gl_shader_program *shader_prog, struct gl_program *prog, |