etnaviv: compiled_framebuffer_state: get rid of SE_SCISSOR_*

[mesa.git] / src / gallium / drivers / etnaviv / etnaviv_screen.h

diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.h b/src/gallium/drivers/etnaviv/etnaviv_screen.h
index 9757985526ecf6da3a09dee8f6d5e88e85512cf6..e69d598c46303454bf0ebc88fb809a11a7c6215b 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.h
@@ -38,6 +38,7 @@
 #include "util/slab.h"
 #include "util/u_dynarray.h"
 #include "util/u_helpers.h"
+#include "compiler/nir/nir.h"
 
 struct etna_bo;
 
@@ -50,6 +51,7 @@ enum viv_features_word {
    viv_chipMinorFeatures3 = 4,
    viv_chipMinorFeatures4 = 5,
    viv_chipMinorFeatures5 = 6,
+   viv_chipMinorFeatures6 = 7,
    VIV_FEATURES_WORD_COUNT /* Must be last */
 };
 
@@ -83,9 +85,7 @@ struct etna_screen {
 
    uint32_t drm_version;
 
-   /* set of resources used by currently-unsubmitted renders */
-   mtx_t lock;
-   struct set *used_resources;
+   nir_shader_compiler_options options;
 };
 
 static inline struct etna_screen *