OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: gather stream output info

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Samuel Pitoiset
2018-10-05 17:45:58 +02:00
parent fe551ec122
commit f4fa8de794
3 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/amd/vulkan/radv_private.h
View File

@@ -99,6 +99,9 @@ typedef uint32_t xcb_window_t;
#define NUM_META_FS_KEYS 12 #define NUM_META_FS_KEYS 12
#define RADV_MAX_DRM_DEVICES 8 #define RADV_MAX_DRM_DEVICES 8
#define MAX_VIEWS 8 #define MAX_VIEWS 8
#define MAX_SO_STREAMS 4
#define MAX_SO_BUFFERS 4
#define MAX_SO_OUTPUTS 64
#define NUM_DEPTH_CLEAR_PIPELINES 3 #define NUM_DEPTH_CLEAR_PIPELINES 3

18
src/amd/vulkan/radv_shader.h
View File

@@ -143,6 +143,22 @@ enum radv_ud_index {
AC_UD_TES_MAX_UD, AC_UD_TES_MAX_UD,
AC_UD_MAX_UD = AC_UD_TCS_MAX_UD, AC_UD_MAX_UD = AC_UD_TCS_MAX_UD,
}; };
struct radv_stream_output {
uint8_t location;
uint8_t buffer;
uint16_t offset;
uint8_t component_mask;
uint8_t stream;
};
struct radv_streamout_info {
uint16_t num_outputs;
struct radv_stream_output outputs[MAX_SO_OUTPUTS];
uint16_t strides[MAX_SO_BUFFERS];
uint32_t enabled_stream_buffers_mask;
};
struct radv_shader_info { struct radv_shader_info {
bool loads_push_constants; bool loads_push_constants;
uint32_t desc_set_used_mask; uint32_t desc_set_used_mask;
@@ -189,6 +205,8 @@ struct radv_shader_info {
uint64_t outputs_written; uint64_t outputs_written;
uint64_t patch_outputs_written; uint64_t patch_outputs_written;
} tcs; } tcs;
struct radv_streamout_info so;
}; };
struct radv_userdata_info { struct radv_userdata_info {

39
src/amd/vulkan/radv_shader_info.c
View File

@@ -24,6 +24,7 @@
#include "radv_shader.h" #include "radv_shader.h"
#include "nir/nir.h" #include "nir/nir.h"
#include "nir/nir_deref.h" #include "nir/nir_deref.h"
#include "nir/nir_xfb_info.h"
static void mark_sampler_desc(const nir_variable *var, static void mark_sampler_desc(const nir_variable *var,
struct radv_shader_info *info) struct radv_shader_info *info)
@@ -470,6 +471,39 @@ gather_info_output_decl(const nir_shader *nir, const nir_variable *var,
} }
} }
static void
gather_xfb_info(const nir_shader *nir, struct radv_shader_info *info)
{
nir_xfb_info *xfb = nir_gather_xfb_info(nir, NULL);
struct radv_streamout_info *so = &info->so;
if (!xfb)
return;
assert(xfb->output_count < MAX_SO_OUTPUTS);
so->num_outputs = xfb->output_count;
for (unsigned i = 0; i < xfb->output_count; i++) {
struct radv_stream_output *output = &so->outputs[i];
output->buffer = xfb->outputs[i].buffer;
output->stream = xfb->buffer_to_stream[xfb->outputs[i].buffer];
output->offset = xfb->outputs[i].offset;
output->location = xfb->outputs[i].location;
output->component_mask = xfb->outputs[i].component_mask;
so->enabled_stream_buffers_mask |=
(1 << output->buffer) << (output->stream * 4);
}
for (unsigned i = 0; i < NIR_MAX_XFB_BUFFERS; i++) {
so->strides[i] = xfb->strides[i] / 4;
}
ralloc_free(xfb);
}
void void
radv_nir_shader_info_pass(const struct nir_shader *nir, radv_nir_shader_info_pass(const struct nir_shader *nir,
const struct radv_nir_compiler_options *options, const struct radv_nir_compiler_options *options,
@@ -490,4 +524,9 @@ radv_nir_shader_info_pass(const struct nir_shader *nir,
nir_foreach_variable(variable, &nir->outputs) nir_foreach_variable(variable, &nir->outputs)
gather_info_output_decl(nir, variable, info, options); gather_info_output_decl(nir, variable, info, options);
if (nir->info.stage == MESA_SHADER_VERTEX ||
nir->info.stage == MESA_SHADER_TESS_EVAL ||
nir->info.stage == MESA_SHADER_GEOMETRY)
gather_xfb_info(nir, info);
} }