Skip to content

A
angle
Commit 3debd2b4 by daniel@transgaming.com
Options

Make faceforward match the conformance test.

TRAC #12252 The conformance test checks the dot product for >= 0. Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch Author: Andrew Lewycky git-svn-id: https://angleproject.googlecode.com/svn/trunk@276 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 6a94b97d
Showing with 12 additions and 12 deletions
src/compiler/OutputHLSL.cpp
...@@ -515,13 +515,13 @@ void OutputHLSL::header() ...@@ -515,13 +515,13 @@ void OutputHLSL::header()
{ {
out << "float faceforward(float N, float I, float Nref)\n" out << "float faceforward(float N, float I, float Nref)\n"
"{\n" "{\n"
" if(dot(Nref, I) < 0)\n" " if(dot(Nref, I) >= 0)\n"
" {\n" " {\n"
" return N;\n" " return -N;\n"
" }\n" " }\n"
" else\n" " else\n"
" {\n" " {\n"
" return -N;\n" " return N;\n"
" }\n" " }\n"
"}\n" "}\n"
"\n"; "\n";
...@@ -531,13 +531,13 @@ void OutputHLSL::header() ...@@ -531,13 +531,13 @@ void OutputHLSL::header()
{ {
out << "float2 faceforward(float2 N, float2 I, float2 Nref)\n" out << "float2 faceforward(float2 N, float2 I, float2 Nref)\n"
"{\n" "{\n"
" if(dot(Nref, I) < 0)\n" " if(dot(Nref, I) >= 0)\n"
" {\n" " {\n"
" return N;\n" " return -N;\n"
" }\n" " }\n"
" else\n" " else\n"
" {\n" " {\n"
" return -N;\n" " return N;\n"
" }\n" " }\n"
"}\n" "}\n"
"\n"; "\n";
...@@ -547,13 +547,13 @@ void OutputHLSL::header() ...@@ -547,13 +547,13 @@ void OutputHLSL::header()
{ {
out << "float3 faceforward(float3 N, float3 I, float3 Nref)\n" out << "float3 faceforward(float3 N, float3 I, float3 Nref)\n"
"{\n" "{\n"
" if(dot(Nref, I) < 0)\n" " if(dot(Nref, I) >= 0)\n"
" {\n" " {\n"
" return N;\n" " return -N;\n"
" }\n" " }\n"
" else\n" " else\n"
" {\n" " {\n"
" return -N;\n" " return N;\n"
" }\n" " }\n"
"}\n" "}\n"
"\n"; "\n";
...@@ -563,13 +563,13 @@ void OutputHLSL::header() ...@@ -563,13 +563,13 @@ void OutputHLSL::header()
{ {
out << "float4 faceforward(float4 N, float4 I, float4 Nref)\n" out << "float4 faceforward(float4 N, float4 I, float4 Nref)\n"
"{\n" "{\n"
" if(dot(Nref, I) < 0)\n" " if(dot(Nref, I) >= 0)\n"
" {\n" " {\n"
" return N;\n" " return -N;\n"
" }\n" " }\n"
" else\n" " else\n"
" {\n" " {\n"
" return -N;\n" " return N;\n"
" }\n" " }\n"
"}\n" "}\n"
"\n"; "\n";
......
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