summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/r600_pipe.h
diff options
context:
space:
mode:
authorGrazvydas Ignotas <[email protected]>2015-09-03 01:54:27 +0300
committerMarek Olšák <[email protected]>2015-09-03 18:05:54 +0200
commit7d475bad66b99e171542bc9ea62abac56abfa6f2 (patch)
treeb1aef68dff07c25e735339af1c1bb0a51035f303 /src/gallium/drivers/r600/r600_pipe.h
parentce181aea6cb5353181add7b5aca3c0b196a9b513 (diff)
r600g: make all scissor states use single atom
As suggested by Marek Olšák, we can use single atom to track all scissor states. This will allow to simplify dirty atom handling later. Signed-off-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
-rw-r--r--src/gallium/drivers/r600/r600_pipe.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 8d5fd99e65a..e09bee15d46 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -38,7 +38,7 @@
#include "tgsi/tgsi_scan.h"
-#define R600_NUM_ATOMS 75
+#define R600_NUM_ATOMS 60
#define R600_MAX_VIEWPORTS 16
@@ -393,9 +393,9 @@ struct r600_cso_state
struct r600_scissor_state
{
struct r600_atom atom;
- struct pipe_scissor_state scissor;
+ struct pipe_scissor_state scissor[R600_MAX_VIEWPORTS];
+ uint32_t dirty_mask;
bool enable; /* r6xx only */
- int idx;
};
struct r600_fetch_shader {
@@ -458,7 +458,7 @@ struct r600_context {
struct r600_poly_offset_state poly_offset_state;
struct r600_cso_state rasterizer_state;
struct r600_sample_mask sample_mask;
- struct r600_scissor_state scissor[R600_MAX_VIEWPORTS];
+ struct r600_scissor_state scissor;
struct r600_seamless_cube_map seamless_cube_map;
struct r600_config_state config_state;
struct r600_stencil_ref_state stencil_ref;