diff options
| author | Brian Paul <[email protected]> | 2014-01-18 03:45:41 -0800 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2014-01-23 08:22:58 -0700 |
| commit | 2a30379dcdb9f643d97ba48811fddf90484a84f2 (patch) | |
| tree | 2aec1bd9e1d978554483fc279db54f96a7eaf2fe /src/gallium/drivers/svga/svga_context.h | |
| parent | 35ddd2cc5d1b25d9ca7f2473f4523791e37ed385 (diff) | |
svga: rename shader_result -> variant
To be more consisten with other parts of gallium. Plus, update/add
various comments.
Reviewed-by: José Fonseca <[email protected]>
Diffstat (limited to 'src/gallium/drivers/svga/svga_context.h')
| -rw-r--r-- | src/gallium/drivers/svga/svga_context.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gallium/drivers/svga/svga_context.h b/src/gallium/drivers/svga/svga_context.h index dee0cec6460..f75fac5a1cc 100644 --- a/src/gallium/drivers/svga/svga_context.h +++ b/src/gallium/drivers/svga/svga_context.h @@ -50,7 +50,7 @@ struct draw_vertex_shader; struct draw_fragment_shader; -struct svga_shader_result; +struct svga_shader_variant; struct SVGACmdMemory; struct util_bitmask; @@ -61,11 +61,13 @@ struct svga_shader struct tgsi_shader_info info; - struct svga_shader_result *results; + /** Head of linked list of variants */ + struct svga_shader_variant *variants; unsigned id; /**< for debugging only */ }; + struct svga_fragment_shader { struct svga_shader base; @@ -78,6 +80,7 @@ struct svga_fragment_shader int8_t generic_remap_table[MAX_GENERIC_VARYING]; }; + struct svga_vertex_shader { struct svga_shader base; @@ -282,8 +285,8 @@ struct svga_hw_draw_state unsigned ts[SVGA3D_PIXEL_SAMPLERREG_MAX][SVGA3D_TS_MAX]; float cb[PIPE_SHADER_TYPES][SVGA3D_CONSTREG_MAX][4]; - struct svga_shader_result *fs; - struct svga_shader_result *vs; + struct svga_shader_variant *fs; + struct svga_shader_variant *vs; struct svga_hw_view_state views[PIPE_MAX_SAMPLERS]; unsigned num_views; @@ -405,8 +408,8 @@ struct svga_context #define SVGA_NEW_NEED_PIPELINE 0x100000 #define SVGA_NEW_NEED_SWVFETCH 0x200000 #define SVGA_NEW_NEED_SWTNL 0x400000 -#define SVGA_NEW_FS_RESULT 0x800000 -#define SVGA_NEW_VS_RESULT 0x1000000 +#define SVGA_NEW_FS_VARIANT 0x800000 +#define SVGA_NEW_VS_VARIANT 0x1000000 #define SVGA_NEW_TEXTURE_FLAGS 0x4000000 #define SVGA_NEW_STENCIL_REF 0x8000000 |