diff options
| author | Marek Olšák <[email protected]> | 2012-10-06 06:05:32 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-10-10 00:17:05 +0200 |
| commit | c5584e93b186bdec3d47c993db4c6461dcf6a75c (patch) | |
| tree | bb332651e999d9eeac316cc474fb5544c6340eb7 /src/gallium/drivers/r600/r600_pipe.h | |
| parent | ae25b932456eb368ea91d167614751172edacfee (diff) | |
r600g: move DB_SHADER_CONTROL into db_misc_state
Also update the register value in more appropriate places
than r600_update_derived_state.
Reviewed-by: Jerome Glisse <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 144e4674599..1be9ff465c6 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -72,6 +72,7 @@ struct r600_db_misc_state { bool copy_depth, copy_stencil; unsigned copy_sample; unsigned log_samples; + unsigned db_shader_control; }; struct r600_cb_misc_state { @@ -434,7 +435,6 @@ struct r600_context { /* Additional context states. */ unsigned flags; unsigned compute_cb_target_mask; - unsigned db_shader_control; struct r600_pipe_shader_selector *ps_shader; struct r600_pipe_shader_selector *vs_shader; struct r600_rasterizer_state *rasterizer; @@ -543,7 +543,7 @@ void evergreen_init_color_surface(struct r600_context *rctx, struct r600_surface *surf); void evergreen_init_color_surface_rat(struct r600_context *rctx, struct r600_surface *surf); -void evergreen_update_dual_export_state(struct r600_context * rctx); +void evergreen_update_db_shader_control(struct r600_context * rctx); /* r600_blit.c */ void r600_copy_buffer(struct pipe_context *ctx, struct @@ -614,7 +614,7 @@ boolean r600_is_format_supported(struct pipe_screen *screen, enum pipe_texture_target target, unsigned sample_count, unsigned usage); -void r600_update_dual_export_state(struct r600_context * rctx); +void r600_update_db_shader_control(struct r600_context * rctx); /* r600_texture.c */ void r600_init_screen_texture_functions(struct pipe_screen *screen); |