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

mesa: replace ParameterValueOffset[i] with Parameters[i].ValueOffset

Browse Source 
to merge both arrays and remove malloc because both arrays have
the same size.

Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6946>
This commit is contained in:
Marek Olšák
2020-11-22 03:39:56 -05:00
committed by Marge Bot
parent 1755a5a384
commit 4679a3855f
17 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/program/prog_statevars.c
View File

@@ -1229,7 +1229,7 @@ _mesa_load_state_parameters(struct gl_context *ctx,
int num = paramList->NumParameters;
for (int i = paramList->FirstStateVarIndex; i < num; i++) {
unsigned pvo = paramList->ParameterValueOffset[i];
unsigned pvo = paramList->Parameters[i].ValueOffset;
fetch_state(ctx, paramList->Parameters[i].StateIndexes,
paramList->ParameterValues + pvo);
}
@@ -1244,7 +1244,7 @@ _mesa_upload_state_parameters(struct gl_context *ctx,
int num = paramList->NumParameters;
for (int i = paramList->FirstStateVarIndex; i < num; i++) {
unsigned pvo = paramList->ParameterValueOffset[i];
unsigned pvo = paramList->Parameters[i].ValueOffset;
fetch_state(ctx, paramList->Parameters[i].StateIndexes,
(gl_constant_value*)(dst + pvo));
}
@@ -1359,8 +1359,8 @@ _mesa_optimize_state_parameters(struct gl_program_parameter_list *list)
list->Parameters[first_param].StateIndexes[2] =
list->Parameters[first_param].Size =
list->Parameters[last_param].Size +
list->ParameterValueOffset[last_param] -
list->ParameterValueOffset[first_param];
list->Parameters[last_param].ValueOffset -
list->Parameters[first_param].ValueOffset;
param_diff = last_param - first_param;
}
@@ -1382,10 +1382,6 @@ _mesa_optimize_state_parameters(struct gl_program_parameter_list *list)
&list->Parameters[last_param + 1],
sizeof(list->Parameters[0]) *
(list->NumParameters - last_param - 1));
memmove(&list->ParameterValueOffset[first_param + 1],
&list->ParameterValueOffset[last_param + 1],
sizeof(list->ParameterValueOffset[0]) *
(list->NumParameters - last_param - 1));
list->NumParameters -= param_diff;
}
}