---
src/compiler/nir/nir_xfb_info.h | 2 +-
src/intel/vulkan/anv_blorp.c | 3 +-
src/intel/vulkan/anv_pipeline.c | 4 +--
src/intel/vulkan/anv_pipeline_cache.c | 48 +++++++++++++++++++++++----
src/intel/vulkan/anv_private.h | 6 ++++
5 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/src/compiler/nir/nir_xfb_info.h b/src/compiler/nir/nir_xfb_info.h
index 9b543df5f47..6b16ce2a60a 100644
--- a/src/compiler/nir/nir_xfb_info.h
+++ b/src/compiler/nir/nir_xfb_info.h
@@ -36,7 +36,7 @@ typedef struct {
uint8_t component_mask;
} nir_xfb_output_info;
-typedef struct {
+typedef struct nir_xfb_info {
uint8_t buffers_written;
uint8_t streams_written;
diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index 478b8e7a3db..29ed6b2ee35 100644
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -71,7 +71,8 @@ upload_blorp_shader(struct blorp_context *blorp,
anv_pipeline_cache_upload_kernel(&device->default_pipeline_cache,
key, key_size, kernel, kernel_size,
NULL, 0,
- prog_data, prog_data_size, &bind_map);
+ prog_data, prog_data_size,
+ NULL, &bind_map);
if (!bin)
return false;
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index be05c11f45d..570c9469b8f 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -1057,7 +1057,7 @@ anv_pipeline_compile_graphics(struct anv_pipeline
*pipeline,
stages[s].nir->constant_data_size,
&stages[s].prog_data.base,
brw_prog_data_size(s),
- &stages[s].bind_map);
+ NULL, &stages[s].bind_map);
if (!bin) {
ralloc_free(stage_ctx);
result = vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -1170,7 +1170,7 @@ anv_pipeline_compile_cs(struct anv_pipeline *pipeline,
stage.nir->constant_data_size,
&stage.prog_data.base,
sizeof(stage.prog_data.cs),
- &stage.bind_map);
+ NULL, &stage.bind_map);
if (!bin) {
ralloc_free(mem_ctx);
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
diff --git a/src/intel/vulkan/anv_pipeline_cache.c
b/src/intel/vulkan/anv_pipeline_cache.c
index 3efa427279d..added776519 100644
--- a/src/intel/vulkan/anv_pipeline_cache.c
+++ b/src/intel/vulkan/anv_pipeline_cache.c
@@ -27,6 +27,7 @@
#include "util/disk_cache.h"
#include "util/mesa-sha1.h"
#include "anv_private.h"
+#include "nir/nir_xfb_info.h"
struct anv_shader_bin *
anv_shader_bin_create(struct anv_device *device,
@@ -35,12 +36,14 @@ anv_shader_bin_create(struct anv_device *device,
const void *constant_data, uint32_t constant_data_size,
const struct brw_stage_prog_data *prog_data_in,
uint32_t prog_data_size, const void *prog_data_param_in,
+ const nir_xfb_info *xfb_info_in,
const struct anv_pipeline_bind_map *bind_map)
{
struct anv_shader_bin *shader;
struct anv_shader_bin_key *key;
struct brw_stage_prog_data *prog_data;
uint32_t *prog_data_param;
+ nir_xfb_info *xfb_info;
struct anv_pipeline_binding *surface_to_descriptor, *sampler_to_descriptor;
ANV_MULTIALLOC(ma);
@@ -48,6 +51,10 @@ anv_shader_bin_create(struct anv_device *device,
anv_multialloc_add_size(&ma, &key, sizeof(*key) + key_size);
anv_multialloc_add_size(&ma, &prog_data, prog_data_size);
anv_multialloc_add(&ma, &prog_data_param, prog_data_in->nr_params);
+ if (xfb_info_in) {
+ uint32_t xfb_info_size = nir_xfb_info_size(xfb_info_in->output_count);
+ anv_multialloc_add_size(&ma, &xfb_info, xfb_info_size);
+ }
anv_multialloc_add(&ma, &surface_to_descriptor,
bind_map->surface_count);
anv_multialloc_add(&ma, &sampler_to_descriptor,
@@ -85,6 +92,15 @@ anv_shader_bin_create(struct anv_device *device,
shader->prog_data = prog_data;
shader->prog_data_size = prog_data_size;
+ if (xfb_info_in) {
+ *xfb_info = *xfb_info_in;
+ typed_memcpy(xfb_info->outputs, xfb_info_in->outputs,
+ xfb_info_in->output_count);
+ shader->xfb_info = xfb_info;
+ } else {
+ shader->xfb_info = NULL;
+ }
+
shader->bind_map = *bind_map;
typed_memcpy(surface_to_descriptor, bind_map->surface_to_descriptor,
bind_map->surface_count);
@@ -128,6 +144,15 @@ anv_shader_bin_write_to_blob(const struct anv_shader_bin
*shader,
shader->prog_data->nr_params *
sizeof(*shader->prog_data->param));
+ if (shader->xfb_info) {
+ uint32_t xfb_info_size =
+ nir_xfb_info_size(shader->xfb_info->output_count);
+ ok = blob_write_uint32(blob, xfb_info_size);
+ ok = blob_write_bytes(blob, shader->xfb_info, xfb_info_size);
+ } else {
+ ok = blob_write_uint32(blob, 0);
+ }
+
ok = blob_write_uint32(blob, shader->bind_map.surface_count);
ok = blob_write_uint32(blob, shader->bind_map.sampler_count);
ok = blob_write_uint32(blob, shader->bind_map.image_count);
@@ -162,6 +187,11 @@ anv_shader_bin_create_from_blob(struct anv_device *device,
const void *prog_data_param =
blob_read_bytes(blob, prog_data->nr_params * sizeof(*prog_data->param));
+ const nir_xfb_info *xfb_info = NULL;
+ uint32_t xfb_size = blob_read_uint32(blob);
+ if (xfb_size)
+ xfb_info = blob_read_bytes(blob, xfb_size);
+
struct anv_pipeline_bind_map bind_map;
bind_map.surface_count = blob_read_uint32(blob);
bind_map.sampler_count = blob_read_uint32(blob);
@@ -181,7 +211,7 @@ anv_shader_bin_create_from_blob(struct anv_device *device,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size, prog_data_param,
- &bind_map);
+ xfb_info, &bind_map);
}
/* Remaining work:
@@ -311,6 +341,7 @@ anv_pipeline_cache_add_shader_locked(struct
anv_pipeline_cache *cache,
const struct brw_stage_prog_data
*prog_data,
uint32_t prog_data_size,
const void *prog_data_param,
+ const nir_xfb_info *xfb_info,
const struct anv_pipeline_bind_map
*bind_map)
{
struct anv_shader_bin *shader =
@@ -323,7 +354,7 @@ anv_pipeline_cache_add_shader_locked(struct
anv_pipeline_cache *cache,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size, prog_data_param,
- bind_map);
+ xfb_info, bind_map);
if (!bin)
return NULL;
@@ -340,6 +371,7 @@ anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache
*cache,
uint32_t constant_data_size,
const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
+ const nir_xfb_info *xfb_info,
const struct anv_pipeline_bind_map *bind_map)
{
if (cache->cache) {
@@ -350,7 +382,8 @@ anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache
*cache,
kernel_data, kernel_size,
constant_data,
constant_data_size,
prog_data, prog_data_size,
- prog_data->param, bind_map);
+ prog_data->param,
+ xfb_info, bind_map);
pthread_mutex_unlock(&cache->mutex);
@@ -365,7 +398,8 @@ anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache
*cache,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size,
- prog_data->param, bind_map);
+ prog_data->param,
+ xfb_info, bind_map);
}
}
@@ -604,6 +638,7 @@ anv_device_upload_kernel(struct anv_device *device,
uint32_t constant_data_size,
const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
+ const nir_xfb_info *xfb_info,
const struct anv_pipeline_bind_map *bind_map)
{
struct anv_shader_bin *bin;
@@ -612,13 +647,14 @@ anv_device_upload_kernel(struct anv_device *device,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size,
- bind_map);
+ xfb_info, bind_map);
} else {
bin = anv_shader_bin_create(device, key_data, key_size,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size,
- prog_data->param, bind_map);
+ prog_data->param,
+ xfb_info, bind_map);
}
if (bin == NULL)
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 5b4c286bf38..9b7f614a3f0 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -935,6 +935,7 @@ struct anv_pipeline_cache {
struct hash_table * cache;
};
+struct nir_xfb_info;
struct anv_pipeline_bind_map;
void anv_pipeline_cache_init(struct anv_pipeline_cache *cache,
@@ -953,6 +954,7 @@ anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache
*cache,
uint32_t constant_data_size,
const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
+ const struct nir_xfb_info *xfb_info,
const struct anv_pipeline_bind_map *bind_map);
struct anv_shader_bin *
@@ -969,6 +971,7 @@ anv_device_upload_kernel(struct anv_device *device,
uint32_t constant_data_size,
const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
+ const struct nir_xfb_info *xfb_info,
const struct anv_pipeline_bind_map *bind_map);
struct anv_device {
@@ -2366,6 +2369,8 @@ struct anv_shader_bin {
const struct brw_stage_prog_data *prog_data;
uint32_t prog_data_size;
+ struct nir_xfb_info *xfb_info;
+
struct anv_pipeline_bind_map bind_map;
};
@@ -2376,6 +2381,7 @@ anv_shader_bin_create(struct anv_device *device,
const void *constant_data, uint32_t constant_data_size,
const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size, const void *prog_data_param,
+ const struct nir_xfb_info *xfb_info,
const struct anv_pipeline_bind_map *bind_map);
void
--
2.19.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
