Rev 4358 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4358 | Rev 4401 | ||
|---|---|---|---|
| Line 1513... | Line 1513... | ||
| 1513 | /* setup vertex arrays */ |
1513 | /* setup vertex arrays */ |
| 1514 | _mesa_VertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, |
1514 | _mesa_VertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, |
| 1515 | sizeof(struct vertex), OFFSET(x)); |
1515 | sizeof(struct vertex), OFFSET(x)); |
| 1516 | _mesa_VertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, |
1516 | _mesa_VertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, |
| 1517 | sizeof(struct vertex), OFFSET(s)); |
1517 | sizeof(struct vertex), OFFSET(s)); |
| - | 1518 | ||
| - | 1519 | _mesa_EnableVertexAttribArray(0); |
|
| - | 1520 | _mesa_EnableVertexAttribArray(1); |
|
| 1518 | } |
1521 | } |
| Line 1519... | Line 1522... | ||
| 1519 | 1522 | ||
| 1520 | /* Generate a relevant fragment shader program for the texture target */ |
1523 | /* Generate a relevant fragment shader program for the texture target */ |
| 1521 | if ((target == GL_TEXTURE_2D && blit->ShaderProg != 0) || |
1524 | if ((target == GL_TEXTURE_2D && blit->ShaderProg != 0) || |
| Line 1589... | Line 1592... | ||
| 1589 | _mesa_DeleteObjectARB(fs); |
1592 | _mesa_DeleteObjectARB(fs); |
| 1590 | _mesa_AttachShader(ShaderProg, vs); |
1593 | _mesa_AttachShader(ShaderProg, vs); |
| 1591 | _mesa_DeleteObjectARB(vs); |
1594 | _mesa_DeleteObjectARB(vs); |
| 1592 | _mesa_BindAttribLocation(ShaderProg, 0, "position"); |
1595 | _mesa_BindAttribLocation(ShaderProg, 0, "position"); |
| 1593 | _mesa_BindAttribLocation(ShaderProg, 1, "texcoords"); |
1596 | _mesa_BindAttribLocation(ShaderProg, 1, "texcoords"); |
| 1594 | _mesa_EnableVertexAttribArray(0); |
- | |
| 1595 | _mesa_EnableVertexAttribArray(1); |
- | |
| 1596 | link_program_with_debug(ctx, ShaderProg); |
1597 | link_program_with_debug(ctx, ShaderProg); |
| 1597 | ralloc_free(mem_ctx); |
1598 | ralloc_free(mem_ctx); |
| 1598 | if (texture_2d) |
1599 | if (texture_2d) |
| 1599 | blit->ShaderProg = ShaderProg; |
1600 | blit->ShaderProg = ShaderProg; |
| 1600 | else |
1601 | else |