diff options
| -rw-r--r-- | src/mesa/shader/prog_parameter.c | 6 | ||||
| -rw-r--r-- | src/mesa/shader/prog_statevars.h | 2 | ||||
| -rw-r--r-- | src/mesa/shader/shader_api.c | 2 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_link2.c | 8 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c index 8945f2d854..900fb7e1a5 100644 --- a/src/mesa/shader/prog_parameter.c +++ b/src/mesa/shader/prog_parameter.c @@ -289,16 +289,14 @@ _mesa_add_attribute(struct gl_program_parameter_list *paramList, GLint i = _mesa_lookup_parameter_index(paramList, -1, name); if (i >= 0) { /* replace */ - ASSERT(paramList->Parameters[i].StateIndexes[0] == STATE_USER_ATTRIB); if (attrib < 0) attrib = i; - paramList->Parameters[i].StateIndexes[1] = attrib; + paramList->Parameters[i].StateIndexes[0] = attrib; } else { /* add */ gl_state_index state[STATE_LENGTH]; - state[0] = STATE_USER_ATTRIB; - state[1] = attrib; + state[0] = attrib; i = _mesa_add_parameter(paramList, PROGRAM_INPUT, name, size, NULL, state); } diff --git a/src/mesa/shader/prog_statevars.h b/src/mesa/shader/prog_statevars.h index 47ef615f9b..95e38ca7b6 100644 --- a/src/mesa/shader/prog_statevars.h +++ b/src/mesa/shader/prog_statevars.h @@ -103,8 +103,6 @@ typedef enum gl_state_index_ { STATE_NORMAL_SCALE, STATE_TEXRECT_SCALE, STATE_POSITION_NORMALIZED, /* normalized light position */ - STATE_USER_ATTRIB, /** shader vertex attrib: user-specified */ - STATE_AUTO_ATTRIB, /** shader vertex attrib: linker-specified */ STATE_INTERNAL_DRIVER /* first available state index for drivers (must be last) */ } gl_state_index; diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c index 397ce916ea..101c6f1e7e 100644 --- a/src/mesa/shader/shader_api.c +++ b/src/mesa/shader/shader_api.c @@ -554,7 +554,7 @@ _mesa_get_attrib_location(GLcontext *ctx, GLuint program, if (shProg->Attributes) { GLint i = _mesa_lookup_parameter_index(shProg->Attributes, -1, name); if (i >= 0) { - return shProg->Attributes->Parameters[i].StateIndexes[1]; + return shProg->Attributes->Parameters[i].StateIndexes[0]; } } return -1; diff --git a/src/mesa/shader/slang/slang_link2.c b/src/mesa/shader/slang/slang_link2.c index da5ba5c292..7dfdd288e1 100644 --- a/src/mesa/shader/slang/slang_link2.c +++ b/src/mesa/shader/slang/slang_link2.c @@ -332,7 +332,7 @@ _slang_resolve_attributes(struct gl_shader_program *shProg, */ usedAttributes = 0x0; for (i = 0; i < shProg->Attributes->NumParameters; i++) { - GLint attr = shProg->Attributes->Parameters[i].StateIndexes[1]; + GLint attr = shProg->Attributes->Parameters[i].StateIndexes[0]; usedAttributes |= attr; } @@ -358,7 +358,7 @@ _slang_resolve_attributes(struct gl_shader_program *shProg, GLint attr; if (index >= 0) { /* found, user must have specified a binding */ - attr = shProg->Attributes->Parameters[index].StateIndexes[1]; + attr = shProg->Attributes->Parameters[index].StateIndexes[0]; } else { /* not found, choose our own attribute number */ @@ -568,7 +568,9 @@ _slang_link2(GLcontext *ctx, _slang_resolve_samplers(shProg, &shProg->VertexProgram->Base); _slang_resolve_samplers(shProg, &shProg->FragmentProgram->Base); - _slang_resolve_attributes(shProg, &shProg->VertexProgram->Base); + if (!_slang_resolve_attributes(shProg, &shProg->VertexProgram->Base)) { + /*goto cleanup;*/ + } _slang_update_inputs_outputs(&shProg->VertexProgram->Base); _slang_update_inputs_outputs(&shProg->FragmentProgram->Base); |