Commit e04b5cfb by Alexis Hetu Committed by Alexis Hétu

Support for new texture function names

There are explicit checks for texture function names in OutputASM, which fail in ES3 because new function names are available, so some of the new function names have been added to the checks. Change-Id: I7ec8302a31c02500514ede4e36610dca1dafd235 Reviewed-on: https://swiftshader-review.googlesource.com/3752Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 887bc44f
...@@ -825,7 +825,7 @@ namespace glsl ...@@ -825,7 +825,7 @@ namespace glsl
} }
else UNREACHABLE(argumentCount); else UNREACHABLE(argumentCount);
} }
else if(name == "texture2DProj") else if(name == "texture2DProj" || name == "textureProj")
{ {
TIntermTyped *t = arg[1]->getAsTyped(); TIntermTyped *t = arg[1]->getAsTyped();
...@@ -866,7 +866,7 @@ namespace glsl ...@@ -866,7 +866,7 @@ namespace glsl
} }
else UNREACHABLE(argumentCount); else UNREACHABLE(argumentCount);
} }
else if(name == "texture2DLod" || name == "textureCubeLod") else if(name == "texture2DLod" || name == "textureCubeLod" || name == "textureLod")
{ {
Temporary uvwb(this); Temporary uvwb(this);
emit(sw::Shader::OPCODE_MOV, &uvwb, arg[1]); emit(sw::Shader::OPCODE_MOV, &uvwb, arg[1]);
...@@ -875,7 +875,7 @@ namespace glsl ...@@ -875,7 +875,7 @@ namespace glsl
emit(sw::Shader::OPCODE_TEXLDL, result, &uvwb, arg[0]); emit(sw::Shader::OPCODE_TEXLDL, result, &uvwb, arg[0]);
} }
else if(name == "texture2DProjLod") else if(name == "texture2DProjLod" || name == "textureProjLod")
{ {
TIntermTyped *t = arg[1]->getAsTyped(); TIntermTyped *t = arg[1]->getAsTyped();
Temporary proj(this); Temporary proj(this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment