X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fradeonsi%2Fsi_shader.c;h=e4429a1ee0f57c2eb380cbdf410feb22f5aa9e0c;hp=e5581b9e25cbb99fc047e9a058af56ffdab71db8;hb=f4ba457e1e6c4c8bd232e3c99f301964b9a1cb4a;hpb=03950473df0c8dbcda9ceaa888704cc22d543950

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index e5581b9e25c..e4429a1ee0f 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1584,7 +1584,7 @@ static LLVMValueRef load_const_buffer_desc_fast_path(struct si_shader_context *c
 	LLVMValueRef desc_elems[] = {
 		desc0,
 		desc1,
-		LLVMConstInt(ctx->i32, (sel->info.const_file_max[0] + 1) * 16, 0),
+		LLVMConstInt(ctx->i32, sel->info.constbuf0_num_slots * 16, 0),
 		LLVMConstInt(ctx->i32, rsrc3, false)
 	};
 
@@ -5028,7 +5028,6 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx,
 	 */
 	if (ctx->screen->info.chip_class >= GFX9) {
 		if (!shader->is_monolithic &&
-		    sel->info.num_instructions > 1 && /* not empty shader */
 		    (shader->key.as_es || shader->key.as_ls) &&
 		    (ctx->type == PIPE_SHADER_TESS_EVAL ||
 		     (ctx->type == PIPE_SHADER_VERTEX &&