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

radeonsi: move VS_STATE.LS_OUT_PATCH_SIZE a few bits higher to make space there

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
This commit is contained in:
Marek Olšák
2019-12-23 20:17:46 -05:00
parent 34ef0c5083
commit cf65c6f0d2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -238,7 +238,7 @@ static LLVMValueRef get_rel_patch_id(struct si_shader_context *ctx)
static LLVMValueRef static LLVMValueRef
get_tcs_in_patch_stride(struct si_shader_context *ctx) get_tcs_in_patch_stride(struct si_shader_context *ctx)
{ {
return si_unpack_param(ctx, ctx->vs_state_bits, 8, 13); return si_unpack_param(ctx, ctx->vs_state_bits, 11, 13);
} }
static unsigned get_tcs_out_vertex_dw_stride_constant(struct si_shader_context *ctx) static unsigned get_tcs_out_vertex_dw_stride_constant(struct si_shader_context *ctx)

4
src/gallium/drivers/radeonsi/si_shader.h
View File

@@ -256,8 +256,8 @@ enum {
#define C_VS_STATE_PROVOKING_VTX_INDEX 0xFFFFFFCF #define C_VS_STATE_PROVOKING_VTX_INDEX 0xFFFFFFCF
#define S_VS_STATE_STREAMOUT_QUERY_ENABLED(x) (((unsigned)(x) & 0x1) << 6) #define S_VS_STATE_STREAMOUT_QUERY_ENABLED(x) (((unsigned)(x) & 0x1) << 6)
#define C_VS_STATE_STREAMOUT_QUERY_ENABLED 0xFFFFFFBF #define C_VS_STATE_STREAMOUT_QUERY_ENABLED 0xFFFFFFBF
#define S_VS_STATE_LS_OUT_PATCH_SIZE(x) (((unsigned)(x) & 0x1FFF) << 8) #define S_VS_STATE_LS_OUT_PATCH_SIZE(x) (((unsigned)(x) & 0x1FFF) << 11)
#define C_VS_STATE_LS_OUT_PATCH_SIZE 0xFFE000FF #define C_VS_STATE_LS_OUT_PATCH_SIZE 0xFF0007FF
#define S_VS_STATE_LS_OUT_VERTEX_SIZE(x) (((unsigned)(x) & 0xFF) << 24) #define S_VS_STATE_LS_OUT_VERTEX_SIZE(x) (((unsigned)(x) & 0xFF) << 24)
#define C_VS_STATE_LS_OUT_VERTEX_SIZE 0x00FFFFFF #define C_VS_STATE_LS_OUT_VERTEX_SIZE 0x00FFFFFF

7
src/gallium/drivers/radeonsi/si_shader_internal.h
View File

@@ -95,8 +95,11 @@ struct si_shader_context {
/* VS states and layout of LS outputs / TCS inputs at the end /* VS states and layout of LS outputs / TCS inputs at the end
* [0] = clamp vertex color * [0] = clamp vertex color
* [1] = indexed * [1] = indexed
* [8:20] = stride between patches in DW = num_inputs * num_vertices * 4 * [2:3] = NGG: output primitive type
* max = 32*32*4 + 32*4 * [4:5] = NGG: provoking vertex index
* [6] = NGG: streamout queries enabled
* [11:23] = stride between patches in DW = num_inputs * num_vertices * 4
* max = 32*32*4 + 32*4
* [24:31] = stride between vertices in DW = num_inputs * 4 * [24:31] = stride between vertices in DW = num_inputs * 4
* max = 32*4 * max = 32*4
*/ */