Fix point rendering.

Change-Id: I8262fa4bc527d719680d83bf9a1b8e88bdae07f8
Reviewed-on: https://swiftshader-review.googlesource.com/3514
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

diff --git a/src/OpenGL/libGLES_CM/Context.cpp b/src/OpenGL/libGLES_CM/Context.cpp
index 334b7dc..1ba9f8b 100644 (file)
--- a/src/OpenGL/libGLES_CM/Context.cpp
+++ b/src/OpenGL/libGLES_CM/Context.cpp
@@ -199,6 +199,7 @@ Context::Context(const egl::Config *config, const Context *shareContext)
        }\r
 \r
        setVertexAttrib(sw::Normal, 0.0f, 0.0f, 1.0f, 1.0f);\r
+       setVertexAttrib(sw::PointSize, 1.0f, 1.0f, 1.0f, 1.0f);\r
 \r
     mHasBeenCurrent = false;\r
 \r
@@ -643,11 +644,6 @@ void Context::setFogColor(float r, float g, float b, float a)
        device->setFogColor(sw::Color<float>(r, g, b, a));\r
 }\r
 \r
-void Context::setPointSize(float size)\r
-{\r
-       device->setPointSize(size);\r
-}\r
-\r
 void Context::setTexture2Denabled(bool enable)\r
 {\r
     texture2Denabled[mState.activeSampler] = enable;\r

diff --git a/src/OpenGL/libGLES_CM/Context.h b/src/OpenGL/libGLES_CM/Context.h
index f795521..d76a13a 100644 (file)
--- a/src/OpenGL/libGLES_CM/Context.h
+++ b/src/OpenGL/libGLES_CM/Context.h
@@ -335,8 +335,6 @@ public:
        void setLightAttenuationLinear(int index, float linear);\r
        void setLightAttenuationQuadratic(int index, float quadratic);\r
 \r
-       void setPointSize(float size);\r
-\r
        void setFog(bool enabled);\r
        void setFogMode(GLenum mode);\r
        void setFogDensity(float fogDensity);\r

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.cpp b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
index 923deb9..175f939 100644 (file)
--- a/src/OpenGL/libGLES_CM/libGLES_CM.cpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
@@ -2702,7 +2702,7 @@ void PointSize(GLfloat size)
 \r
        if(context)\r
        {\r
-               context->setPointSize(size);\r
+               context->setVertexAttrib(sw::PointSize, size, size, size, size);\r
        }\r
 }\r
 \r
@@ -3031,7 +3031,6 @@ void TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *poin
        if(context)\r
        {\r
                GLenum texture = context->getClientActiveTexture();\r
-\r
                VertexAttribPointer(sw::TexCoord0 + (texture - GL_TEXTURE0), size, type, false, stride, pointer);\r
        }\r
 }\r