commit 9c4a6256795efba30ec124b8968339a9dc9a0f15
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 11 04:07:18 2013 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 11 04:07:18 2013 +0000
tree 482981d1cb77b1db84fae064dfc7d2c264bf1da0
parent 22ada2cbe78bc1e2e02841377f9c74b4d074140d

DX11 wants VS output and PS input to be in the exact same order.

TRAC #22241
Signed-off-by: Daniel Koch
Signed-off-by: Shannon Woods
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1658 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index 92ad32a..32ab86e 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -1265,8 +1265,7 @@
     vertexHLSL += "};\n"
                    "\n"
                    "struct VS_OUTPUT\n"
-                   "{\n"
-                   "    float4 gl_Position : " + positionSemantic + ";\n";
+                   "{\n";
 
     for (int r = 0; r < registers; r++)
     {
@@ -1285,10 +1284,11 @@
         vertexHLSL += "    float gl_PointSize : PSIZE;\n";
     }
 
-    vertexHLSL += "};\n"
-                   "\n"
-                   "VS_OUTPUT main(VS_INPUT input)\n"
-                   "{\n";
+    vertexHLSL += "    float4 gl_Position : " + positionSemantic + ";\n"
+                  "};\n"
+                  "\n"
+                  "VS_OUTPUT main(VS_INPUT input)\n"
+                  "{\n";
 
     for (AttributeArray::iterator attribute = vertexShader->mAttributes.begin(); attribute != vertexShader->mAttributes.end(); attribute++)
     {