fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 03:50:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

mesa: remove unrequired else

Browse source 
The if always returns so no need for an else.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Timothy Arceri 2016-04-02 21:07:50 +11:00
parent d64134ecae
commit 6d54096fa6
1 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/mesa/program/prog_parameter.c
View file

@ -248,54 +248,51 @@ _mesa_add_parameter(struct gl_program_parameter_list *paramList,
paramList->Size = 0;
return -1;
}
else {
GLuint i, j;
paramList->NumParameters = oldNum + sz4;
GLuint i, j;
memset(&paramList->Parameters[oldNum], 0,
sz4 * sizeof(struct gl_program_parameter));
paramList->NumParameters = oldNum + sz4;
for (i = 0; i < sz4; i++) {
struct gl_program_parameter *p = paramList->Parameters + oldNum + i;
p->Name = name ? strdup(name) : NULL;
p->Type = type;
p->Size = size;
p->DataType = datatype;
if (values) {
if (size >= 4) {
COPY_4V(paramList->ParameterValues[oldNum + i], values);
memset(&paramList->Parameters[oldNum], 0,
sz4 * sizeof(struct gl_program_parameter));
for (i = 0; i < sz4; i++) {
struct gl_program_parameter *p = paramList->Parameters + oldNum + i;
p->Name = name ? strdup(name) : NULL;
p->Type = type;
p->Size = size;
p->DataType = datatype;
if (values) {
if (size >= 4) {
COPY_4V(paramList->ParameterValues[oldNum + i], values);
} else {
/* copy 1, 2 or 3 values */
GLuint remaining = size % 4;
assert(remaining < 4);
for (j = 0; j < remaining; j++) {
paramList->ParameterValues[oldNum + i][j].f = values[j].f;
}
else {
/* copy 1, 2 or 3 values */
GLuint remaining = size % 4;
assert(remaining < 4);
for (j = 0; j < remaining; j++) {
paramList->ParameterValues[oldNum + i][j].f = values[j].f;
}
/* fill in remaining positions with zeros */
for (; j < 4; j++) {
paramList->ParameterValues[oldNum + i][j].f = 0.0f;
}
/* fill in remaining positions with zeros */
for (; j < 4; j++) {
paramList->ParameterValues[oldNum + i][j].f = 0.0f;
}
values += 4;
p->Initialized = GL_TRUE;
}
else {
/* silence valgrind */
for (j = 0; j < 4; j++)
paramList->ParameterValues[oldNum + i][j].f = 0;
}
size -= 4;
values += 4;
p->Initialized = GL_TRUE;
} else {
/* silence valgrind */
for (j = 0; j < 4; j++)
paramList->ParameterValues[oldNum + i][j].f = 0;
}
if (state) {
for (i = 0; i < STATE_LENGTH; i++)
paramList->Parameters[oldNum].StateIndexes[i] = state[i];
}
return (GLint) oldNum;
size -= 4;
}
if (state) {
for (i = 0; i < STATE_LENGTH; i++)
paramList->Parameters[oldNum].StateIndexes[i] = state[i];
}
return (GLint) oldNum;
}