equal
deleted
inserted
replaced
251 */ |
251 */ |
252 |
252 |
253 static const GLuint QT_VERTEX_COORDS_ATTR = 0; |
253 static const GLuint QT_VERTEX_COORDS_ATTR = 0; |
254 static const GLuint QT_TEXTURE_COORDS_ATTR = 1; |
254 static const GLuint QT_TEXTURE_COORDS_ATTR = 1; |
255 static const GLuint QT_OPACITY_ATTR = 2; |
255 static const GLuint QT_OPACITY_ATTR = 2; |
|
256 static const GLuint QT_PMV_MATRIX_1_ATTR = 3; |
|
257 static const GLuint QT_PMV_MATRIX_2_ATTR = 4; |
|
258 static const GLuint QT_PMV_MATRIX_3_ATTR = 5; |
256 |
259 |
257 class QGLEngineShaderProg; |
260 class QGLEngineShaderProg; |
258 |
261 |
259 class QGLEngineSharedShaders : public QObject |
262 class QGLEngineSharedShaders : public QObject |
260 { |
263 { |
395 |
398 |
396 QVector<uint> uniformLocations; |
399 QVector<uint> uniformLocations; |
397 |
400 |
398 bool useTextureCoords; |
401 bool useTextureCoords; |
399 bool useOpacityAttribute; |
402 bool useOpacityAttribute; |
|
403 bool usePmvMatrix; |
400 |
404 |
401 bool operator==(const QGLEngineShaderProg& other) { |
405 bool operator==(const QGLEngineShaderProg& other) { |
402 // We don't care about the program |
406 // We don't care about the program |
403 return ( mainVertexShader == other.mainVertexShader && |
407 return ( mainVertexShader == other.mainVertexShader && |
404 positionVertexShader == other.positionVertexShader && |
408 positionVertexShader == other.positionVertexShader && |
429 enum Uniform { |
433 enum Uniform { |
430 ImageTexture, |
434 ImageTexture, |
431 PatternColor, |
435 PatternColor, |
432 GlobalOpacity, |
436 GlobalOpacity, |
433 Depth, |
437 Depth, |
434 PmvMatrix, |
|
435 MaskTexture, |
438 MaskTexture, |
436 FragmentColor, |
439 FragmentColor, |
437 LinearData, |
440 LinearData, |
438 Angle, |
441 Angle, |
439 HalfViewportSize, |
442 HalfViewportSize, |