commit 08b3e40fb1473cd5407d53ac504e90391a740a08
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Jul 04 19:16:35 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Jul 04 19:16:35 2012 +0000
tree c68dd99c708fd54465d24a4e7cc37326a1be39b6
parent 13be3e43d5ec86021a920550df137d8de7f120f4

Avoid implicitly enabling centroid sampling on non-point rendering.

TRAC #21121
Issue=340
Signed-off-by: Daniel Koch
Author: Nicolas Capens

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

src/common/version.h

diff --git a/src/common/version.h b/src/common/version.h
index 64f339c..857b8fb 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1191
+#define BUILD_REVISION 1192
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index 4e2dfa4..182e204 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -1316,7 +1316,7 @@
         }
     }
 
-    std::string varyingSemantic = (sm3 ? "COLOR" : "TEXCOORD");
+    std::string varyingSemantic = (vertexShader->mUsesPointSize && sm3 ? "COLOR" : "TEXCOORD");
 
     vertexHLSL += "struct VS_INPUT\n"
                    "{\n";