зеркало из https://github.com/stride3d/xkslang.git
Allow GLSL construction of matrix from matrix, starting with version 120, and always for ES shaders.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20544 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
Родитель
f792295e35
Коммит
71fca670f3
|
@ -9,6 +9,9 @@ float precision;
|
|||
in vec4 i;
|
||||
out vec4 o;
|
||||
|
||||
uniform mat4x2 m;
|
||||
|
||||
void main()
|
||||
{
|
||||
mat2x3 m23 = mat2x3(m);
|
||||
}
|
||||
|
|
|
@ -587,8 +587,8 @@ bool TParseContext::constructorErrorCheck(int line, TIntermNode* node, TFunction
|
|||
}
|
||||
|
||||
if (matrixInMatrix && !type->isArray()) {
|
||||
error(line, "constructing matrix from matrix", "constructor", "(reserved)");
|
||||
return true;
|
||||
profileRequires(line, ENoProfile, 120, 0, "constructing matrix from matrix");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (overFull) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче