Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> On Thu, 2016-02-04 at 21:55 +1100, Timothy Arceri wrote: > --- > src/mesa/program/prog_parameter.c | 70 > --------------------------------------- > src/mesa/program/prog_parameter.h | 7 ---- > 2 files changed, 77 deletions(-) > > diff --git a/src/mesa/program/prog_parameter.c > b/src/mesa/program/prog_parameter.c > index e98946b..34183d4 100644 > --- a/src/mesa/program/prog_parameter.c > +++ b/src/mesa/program/prog_parameter.c > @@ -454,73 +454,3 @@ _mesa_lookup_parameter_constant(const struct > gl_program_parameter_list *list, > *posOut = -1; > return GL_FALSE; > } > - > - > -struct gl_program_parameter_list * > -_mesa_clone_parameter_list(const struct gl_program_parameter_list *list) > -{ > - struct gl_program_parameter_list *clone; > - GLuint i; > - > - clone = _mesa_new_parameter_list(); > - if (!clone) > - return NULL; > - > - /** Not too efficient, but correct */ > - for (i = 0; i < list->NumParameters; i++) { > - struct gl_program_parameter *p = list->Parameters + i; > - struct gl_program_parameter *pCopy; > - GLuint size = MIN2(p->Size, 4); > - GLint j = _mesa_add_parameter(clone, p->Type, p->Name, size, > p->DataType, > - list->ParameterValues[i], NULL); > - assert(j >= 0); > - pCopy = clone->Parameters + j; > - /* copy state indexes */ > - if (p->Type == PROGRAM_STATE_VAR) { > - GLint k; > - for (k = 0; k < STATE_LENGTH; k++) { > - pCopy->StateIndexes[k] = p->StateIndexes[k]; > - } > - } > - else { > - clone->Parameters[j].Size = p->Size; > - } > - > - } > - > - clone->StateFlags = list->StateFlags; > - > - return clone; > -} > - > - > -/** > - * Return a new parameter list which is listA + listB. > - */ > -struct gl_program_parameter_list * > -_mesa_combine_parameter_lists(const struct gl_program_parameter_list *listA, > - const struct gl_program_parameter_list *listB) > -{ > - struct gl_program_parameter_list *list; > - > - if (listA) { > - list = _mesa_clone_parameter_list(listA); > - if (list && listB) { > - GLuint i; > - for (i = 0; i < listB->NumParameters; i++) { > - struct gl_program_parameter *param = listB->Parameters + i; > - _mesa_add_parameter(list, param->Type, param->Name, param->Size, > - param->DataType, > - listB->ParameterValues[i], > - param->StateIndexes); > - } > - } > - } > - else if (listB) { > - list = _mesa_clone_parameter_list(listB); > - } > - else { > - list = NULL; > - } > - return list; > -} > diff --git a/src/mesa/program/prog_parameter.h > b/src/mesa/program/prog_parameter.h > index 44700b7..c04d7a2 100644 > --- a/src/mesa/program/prog_parameter.h > +++ b/src/mesa/program/prog_parameter.h > @@ -99,13 +99,6 @@ _mesa_new_parameter_list_sized(unsigned size); > extern void > _mesa_free_parameter_list(struct gl_program_parameter_list *paramList); > > -extern struct gl_program_parameter_list * > -_mesa_clone_parameter_list(const struct gl_program_parameter_list *list); > - > -extern struct gl_program_parameter_list * > -_mesa_combine_parameter_lists(const struct gl_program_parameter_list *a, > - const struct gl_program_parameter_list *b); > - > static inline GLuint > _mesa_num_parameters(const struct gl_program_parameter_list *list) > {
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev