fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 09:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

draw: s/start_or_maxelt/start/ in llvm VS code

Browse source 
Per the now removed comment, the maxelt part of start_or_maxelt was
not used.  Rename to start to avoid confusion.

Signed-off-by: Brian Paul <brianp@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19024>
This commit is contained in:
Brian Paul 2022-10-07 13:24:25 -06:00 • committed by Marge Bot
parent 4c73a503e3
commit da856af2c9
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/auxiliary/draw/draw_llvm.c
View file

@ -1924,7 +1924,7 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant)
LLVMBuilderRef builder;
char func_name[64];
struct lp_type vs_type;
LLVMValueRef count, fetch_elts, start_or_maxelt;
LLVMValueRef count, fetch_elts, start;
LLVMValueRef vertex_id_offset;
LLVMValueRef stride, step, io_itr;
LLVMValueRef ind_vec, start_vec, have_elts, fetch_max, tmp;
@ -2003,12 +2003,7 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant)
io_ptr = LLVMGetParam(variant_func, 1);
vbuffers_ptr = LLVMGetParam(variant_func, 2);
count = LLVMGetParam(variant_func, 3);
/*
* XXX: the maxelt part is unused. Not really useful, since we cannot
* get index buffer overflows due to vsplit (which provides its own
* elts buffer, with a different size than what's passed in here).
*/
start_or_maxelt = LLVMGetParam(variant_func, 4);
start = LLVMGetParam(variant_func, 4);
/*
* XXX: stride is actually unused. The stride we use is strictly calculated
* from the number of outputs (including the draw_extra outputs).
@ -2028,7 +2023,7 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant)
lp_build_name(io_ptr, "io");
lp_build_name(vbuffers_ptr, "vbuffers");
lp_build_name(count, "count");
lp_build_name(start_or_maxelt, "start_or_maxelt");
lp_build_name(start, "start");
lp_build_name(stride, "stride");
lp_build_name(vb_ptr, "vb");
lp_build_name(system_values.instance_id, "instance_id");
@ -2087,7 +2082,7 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant)
/*
* Only needed for non-indexed path.
*/
start_vec = lp_build_broadcast_scalar(&blduivec, start_or_maxelt);
start_vec = lp_build_broadcast_scalar(&blduivec, start);
/*
* Pre-calculate everything which is constant per shader invocation.
@ -2304,7 +2299,7 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant)
LLVMValueRef base_vertex = lp_build_select(&bld, have_elts, vertex_id_offset, lp_build_const_int32(gallivm, 0));
system_values.basevertex = lp_build_broadcast_scalar(&blduivec, base_vertex);
/* first vertex is for Vulkan base vertex support */
LLVMValueRef first_vertex = lp_build_select(&bld, have_elts, vertex_id_offset, start_or_maxelt);
LLVMValueRef first_vertex = lp_build_select(&bld, have_elts, vertex_id_offset, start);
system_values.firstvertex = lp_build_broadcast_scalar(&blduivec, first_vertex);
system_values.vertex_id = true_index_array;
system_values.vertex_id_nobase = LLVMBuildSub(builder, true_index_array,

2
src/gallium/auxiliary/draw/draw_llvm.h
View file

@ -377,7 +377,7 @@ typedef boolean
struct vertex_header *io,
const struct draw_vertex_buffer vbuffers[PIPE_MAX_ATTRIBS],
unsigned count,
unsigned start_or_maxelt,
unsigned start,
unsigned stride,
struct pipe_vertex_buffer *vertex_buffers,
unsigned instance_id,

8
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
View file

@ -593,15 +593,15 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle,
}
{
unsigned start_or_maxelt, vertex_id_offset;
unsigned start, vertex_id_offset;
const unsigned *elts;
if (fetch_info->linear) {
start_or_maxelt = fetch_info->start;
start = fetch_info->start;
vertex_id_offset = draw->start_index;
elts = NULL;
} else {
start_or_maxelt = draw->pt.user.eltMax;
start = draw->pt.user.eltMax;
vertex_id_offset = draw->pt.user.eltBias;
elts = fetch_info->elts;
}
@ -610,7 +610,7 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle,
llvm_vert_info.verts,
draw->pt.user.vbuffer,
fetch_info->count,
start_or_maxelt,
start,
fpme->vertex_size,
draw->pt.vertex_buffer,
draw->instance_id,