radeonsi: move nir_shader_compiler_options into si_screen

[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 4e850d4b7ee7d339c412edaa0511f4672fc91443..59e186fb12a68fb4edc61eb066d2186f14023b34 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.h
@@ -29,7 +29,7 @@
 #define H_ETNAVIV_SCREEN
 
 #include "etnaviv_internal.h"
-#include "etnaviv_query_pm.h"
+#include "etnaviv_perfmon.h"
 
 #include "os/os_thread.h"
 #include "pipe/p_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;
 
@@ -84,9 +85,8 @@ struct etna_screen {
 
    uint32_t drm_version;
 
-   /* set of resources used by currently-unsubmitted renders */
-   mtx_t lock;
-   struct set *used_resources;
+   struct etna_compiler *compiler;
+   nir_shader_compiler_options options;
 };
 
 static inline struct etna_screen *