Merge branch 'mesa_7_5_branch'
This commit is contained in:
commit
8987410ab6
|
@ -70,6 +70,8 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
|
|||
<li>Initial support for separate compilation units in GLSL compiler.
|
||||
<li>Increased max number of generic GLSL varying variables to 16 (formerly 8).
|
||||
<li>GLSL linker now detects when too many varying variables are used.
|
||||
<li>Optimize-out redundant glMaterial and glShadeModel calls in display lists
|
||||
<li>Fixed gl_TextureMatrix[i][j] array indexing bug in GLSL compiler.
|
||||
</ul>
|
||||
|
||||
|
||||
|
|
|
@ -111,10 +111,9 @@ lookup_statevar(const char *var, GLint index1, GLint index2, const char *field,
|
|||
|
||||
if (isMatrix) {
|
||||
if (tokens[0] == STATE_TEXTURE_MATRIX) {
|
||||
if (index1 >= 0) {
|
||||
tokens[1] = index1; /* which texture matrix */
|
||||
index1 = 0; /* prevent extra addition at end of function */
|
||||
}
|
||||
/* texture_matrix[index1][index2] */
|
||||
tokens[1] = index1 >= 0 ? index1 : 0; /* which texture matrix */
|
||||
index1 = index2; /* move matrix row value to index1 */
|
||||
}
|
||||
if (index1 < 0) {
|
||||
/* index1 is unused: prevent extra addition at end of function */
|
||||
|
@ -682,7 +681,9 @@ _slang_alloc_statevar(slang_ir_node *n,
|
|||
if (n->Opcode == IR_ELEMENT) {
|
||||
/* XXX can only handle constant indexes for now */
|
||||
if (n->Children[1]->Opcode == IR_FLOAT) {
|
||||
index2 = (GLint) n->Children[1]->Value[0];
|
||||
/* two-dimensional array index: mat[i][j] */
|
||||
index2 = index1;
|
||||
index1 = (GLint) n->Children[1]->Value[0];
|
||||
}
|
||||
else {
|
||||
*direct = GL_FALSE;
|
||||
|
|
|
@ -1418,7 +1418,8 @@ slang_inline_function_call(slang_assemble_ctx * A, slang_function *fun,
|
|||
else if (p->type.qualifier == SLANG_QUAL_CONST) {
|
||||
/* a constant input param */
|
||||
if (args[i].type == SLANG_OPER_IDENTIFIER ||
|
||||
args[i].type == SLANG_OPER_LITERAL_FLOAT) {
|
||||
args[i].type == SLANG_OPER_LITERAL_FLOAT ||
|
||||
args[i].type == SLANG_OPER_SUBSCRIPT) {
|
||||
/* replace all occurances of this parameter variable with the
|
||||
* actual argument variable or a literal.
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue