diff options
| author | Chia-I Wu <[email protected]> | 2014-09-20 00:46:35 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2014-09-20 10:13:53 +0800 |
| commit | 6c0de4b979520583c1033794380b1c2e6785064e (patch) | |
| tree | ac8437e1ab0654ad92b39fd152248a2e7ce05db3 /src/gallium/drivers/ilo/shader | |
| parent | 284d767be0589143d5c20fdf1f3b52cadf2663f6 (diff) | |
ilo: add a new struct for context states
Move pipe states in ilo_context to the new ilo_state_vector. The motivation
is that ilo_context consists of several loosely related things. When we need
an ilo_context somewhere, we usually need only one or two of the things in it.
This change makes ilo_state_vector one such thing.
An immediate result is that we no longer need ilo_context in 3D pipelines,
something we have planned for since early days.
Diffstat (limited to 'src/gallium/drivers/ilo/shader')
| -rw-r--r-- | src/gallium/drivers/ilo/shader/ilo_shader_fs.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/shader/ilo_shader_internal.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/shader/ilo_shader_vs.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/ilo/shader/ilo_shader_fs.c b/src/gallium/drivers/ilo/shader/ilo_shader_fs.c index 5d27dded8bf..fbf3216fa24 100644 --- a/src/gallium/drivers/ilo/shader/ilo_shader_fs.c +++ b/src/gallium/drivers/ilo/shader/ilo_shader_fs.c @@ -32,7 +32,6 @@ #include "toy_legalize.h" #include "toy_optimize.h" #include "toy_helpers.h" -#include "ilo_context.h" #include "ilo_shader_internal.h" struct fs_compile_context { diff --git a/src/gallium/drivers/ilo/shader/ilo_shader_internal.h b/src/gallium/drivers/ilo/shader/ilo_shader_internal.h index 8d4a6a18c6b..498e7433be7 100644 --- a/src/gallium/drivers/ilo/shader/ilo_shader_internal.h +++ b/src/gallium/drivers/ilo/shader/ilo_shader_internal.h @@ -29,7 +29,7 @@ #define ILO_SHADER_INTERNAL_H #include "ilo_common.h" -#include "ilo_context.h" +#include "ilo_state.h" #include "ilo_shader.h" /* XXX The interface needs to be reworked */ @@ -189,7 +189,7 @@ struct ilo_shader_state { void ilo_shader_variant_init(struct ilo_shader_variant *variant, const struct ilo_shader_info *info, - const struct ilo_context *ilo); + const struct ilo_state_vector *vec); bool ilo_shader_state_use_variant(struct ilo_shader_state *state, diff --git a/src/gallium/drivers/ilo/shader/ilo_shader_vs.c b/src/gallium/drivers/ilo/shader/ilo_shader_vs.c index 7abdf70a453..da88e55f65a 100644 --- a/src/gallium/drivers/ilo/shader/ilo_shader_vs.c +++ b/src/gallium/drivers/ilo/shader/ilo_shader_vs.c @@ -32,7 +32,6 @@ #include "toy_legalize.h" #include "toy_optimize.h" #include "toy_helpers.h" -#include "ilo_context.h" #include "ilo_shader_internal.h" struct vs_compile_context { |