yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a ModelViewProjectionMatrix uniform

Browse source
This commit is contained in:
Fredrik Höglund 2014-04-01 18:07:47 +02:00
parent afcc8337de
commit 05c309da67
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libkwineffects/kwinglutils.cpp
View file

@ -418,11 +418,12 @@ void GLShader::resolveLocations()
if (mLocationsResolved)
return;
mMatrixLocation[TextureMatrix] = uniformLocation("textureMatrix");
mMatrixLocation[ProjectionMatrix] = uniformLocation("projection");
mMatrixLocation[ModelViewMatrix] = uniformLocation("modelview");
mMatrixLocation[WindowTransformation] = uniformLocation("windowTransformation");
mMatrixLocation[ScreenTransformation] = uniformLocation("screenTransformation");
mMatrixLocation[TextureMatrix] = uniformLocation("textureMatrix");
mMatrixLocation[ProjectionMatrix] = uniformLocation("projection");
mMatrixLocation[ModelViewMatrix] = uniformLocation("modelview");
mMatrixLocation[ModelViewProjectionMatrix] = uniformLocation("modelViewProjectionMatrix");
mMatrixLocation[WindowTransformation] = uniformLocation("windowTransformation");
mMatrixLocation[ScreenTransformation] = uniformLocation("screenTransformation");
mVec2Location[Offset] = uniformLocation("offset");

1
libkwineffects/kwinglutils.h
View file

@ -133,6 +133,7 @@ public:
TextureMatrix = 0,
ProjectionMatrix,
ModelViewMatrix,
ModelViewProjectionMatrix,
WindowTransformation,
ScreenTransformation,
MatrixCount