Commit 70415e40 by Nicolas Capens

Fix point rendering.

Change-Id: I8262fa4bc527d719680d83bf9a1b8e88bdae07f8 Reviewed-on: https://swiftshader-review.googlesource.com/3514Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent e7c4ab0c
...@@ -199,6 +199,7 @@ Context::Context(const egl::Config *config, const Context *shareContext) ...@@ -199,6 +199,7 @@ Context::Context(const egl::Config *config, const Context *shareContext)
} }
setVertexAttrib(sw::Normal, 0.0f, 0.0f, 1.0f, 1.0f); setVertexAttrib(sw::Normal, 0.0f, 0.0f, 1.0f, 1.0f);
setVertexAttrib(sw::PointSize, 1.0f, 1.0f, 1.0f, 1.0f);
mHasBeenCurrent = false; mHasBeenCurrent = false;
...@@ -643,11 +644,6 @@ void Context::setFogColor(float r, float g, float b, float a) ...@@ -643,11 +644,6 @@ void Context::setFogColor(float r, float g, float b, float a)
device->setFogColor(sw::Color<float>(r, g, b, a)); device->setFogColor(sw::Color<float>(r, g, b, a));
} }
void Context::setPointSize(float size)
{
device->setPointSize(size);
}
void Context::setTexture2Denabled(bool enable) void Context::setTexture2Denabled(bool enable)
{ {
texture2Denabled[mState.activeSampler] = enable; texture2Denabled[mState.activeSampler] = enable;
......
...@@ -335,8 +335,6 @@ public: ...@@ -335,8 +335,6 @@ public:
void setLightAttenuationLinear(int index, float linear); void setLightAttenuationLinear(int index, float linear);
void setLightAttenuationQuadratic(int index, float quadratic); void setLightAttenuationQuadratic(int index, float quadratic);
void setPointSize(float size);
void setFog(bool enabled); void setFog(bool enabled);
void setFogMode(GLenum mode); void setFogMode(GLenum mode);
void setFogDensity(float fogDensity); void setFogDensity(float fogDensity);
......
...@@ -2702,7 +2702,7 @@ void PointSize(GLfloat size) ...@@ -2702,7 +2702,7 @@ void PointSize(GLfloat size)
if(context) if(context)
{ {
context->setPointSize(size); context->setVertexAttrib(sw::PointSize, size, size, size, size);
} }
} }
...@@ -3031,7 +3031,6 @@ void TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *poin ...@@ -3031,7 +3031,6 @@ void TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *poin
if(context) if(context)
{ {
GLenum texture = context->getClientActiveTexture(); GLenum texture = context->getClientActiveTexture();
VertexAttribPointer(sw::TexCoord0 + (texture - GL_TEXTURE0), size, type, false, stride, pointer); VertexAttribPointer(sw::TexCoord0 + (texture - GL_TEXTURE0), size, type, false, stride, pointer);
} }
} }
......
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