radeonsi/nir: set colors_read properly

[mesa.git] / src / gallium / drivers / radeonsi / si_compute.h

diff --git a/src/gallium/drivers/radeonsi/si_compute.h b/src/gallium/drivers/radeonsi/si_compute.h
index ed331047beb7eea1bf86f1b43e3b610da4cf97a2..57c0bde4aca13a0b99935d702963f7758c6c7c98 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.h
+++ b/src/gallium/drivers/radeonsi/si_compute.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +25,26 @@
 #ifndef SI_COMPUTE_H
 #define SI_COMPUTE_H
 
+#include "util/u_inlines.h"
+
 #include "si_shader.h"
 
-#define MAX_GLOBAL_BUFFERS 22
+#define MAX_GLOBAL_BUFFERS 32
 
 struct si_compute {
+       struct pipe_reference reference;
        struct si_screen *screen;
-       struct tgsi_token *tokens;
+       union {
+               struct tgsi_token *tgsi;
+               struct nir_shader *nir;
+       } ir;
        struct util_queue_fence ready;
        struct si_compiler_ctx_state compiler_ctx_state;
 
+       /* bitmasks of used descriptor slots */
+       uint32_t active_const_and_shader_buffers;
+       uint64_t active_samplers_and_images;
+
        unsigned ir_type;
        unsigned local_size;
        unsigned private_size;
@@ -42,9 +53,22 @@ struct si_compute {
 
        struct pipe_resource *global_buffers[MAX_GLOBAL_BUFFERS];
        unsigned use_code_object_v2 : 1;
-       unsigned variable_group_size : 1;
        unsigned uses_grid_size:1;
-       unsigned uses_block_size:1;
+       unsigned uses_bindless_samplers:1;
+       unsigned uses_bindless_images:1;
+       bool reads_variable_block_size;
+       unsigned num_cs_user_data_dwords;
 };
 
+void si_destroy_compute(struct si_compute *program);
+
+static inline void
+si_compute_reference(struct si_compute **dst, struct si_compute *src)
+{
+       if (pipe_reference(&(*dst)->reference, &src->reference))
+               si_destroy_compute(*dst);
+
+       *dst = src;
+}
+
 #endif /* SI_COMPUTE_H */