Move the get maximum point size logic to Renderer9.

Trac #22413 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1737 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 4b472353
...@@ -2120,7 +2120,7 @@ int Context::getMajorShaderModel() const ...@@ -2120,7 +2120,7 @@ int Context::getMajorShaderModel() const
float Context::getMaximumPointSize() const float Context::getMaximumPointSize() const
{ {
return mMajorShaderModel == 3 ? mMaximumPointSize : ALIASED_POINT_SIZE_RANGE_MAX_SM2; return mMaximumPointSize;
} }
int Context::getMaximumVaryingVectors() const int Context::getMaximumVaryingVectors() const
......
...@@ -83,7 +83,6 @@ enum QueryType ...@@ -83,7 +83,6 @@ enum QueryType
const float ALIASED_LINE_WIDTH_RANGE_MIN = 1.0f; const float ALIASED_LINE_WIDTH_RANGE_MIN = 1.0f;
const float ALIASED_LINE_WIDTH_RANGE_MAX = 1.0f; const float ALIASED_LINE_WIDTH_RANGE_MAX = 1.0f;
const float ALIASED_POINT_SIZE_RANGE_MIN = 1.0f; const float ALIASED_POINT_SIZE_RANGE_MIN = 1.0f;
const float ALIASED_POINT_SIZE_RANGE_MAX_SM2 = 1.0f;
// Helper structure describing a single vertex attribute // Helper structure describing a single vertex attribute
class VertexAttribute class VertexAttribute
......
...@@ -2261,7 +2261,8 @@ int Renderer9::getMajorShaderModel() const ...@@ -2261,7 +2261,8 @@ int Renderer9::getMajorShaderModel() const
float Renderer9::getMaxPointSize() const float Renderer9::getMaxPointSize() const
{ {
return mDeviceCaps.MaxPointSize; // Point size clamped at 1.0f for SM2
return getMajorShaderModel() == 3 ? mDeviceCaps.MaxPointSize : 1.0f;
} }
int Renderer9::getMaxTextureWidth() const int Renderer9::getMaxTextureWidth() const
......
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