Skip to content

S
swiftshader
Commit 7a57040f by Alexis Hetu Committed by Alexis Hétu
Options

Multisampling value of 1

Setting a multisampling values of 0 or 1 are apparently 2 different cases, so I tried removing the even number check to fix this. It didn't break any tests, but I'm not sure how well this is covered by the tests. Change-Id: I0e7de9b153288f0c07bde9a2f104ea1d2bf230ac Reviewed-on: https://swiftshader-review.googlesource.com/3622Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 8e8a7e85
Showing with 21 additions and 21 deletions
src/OpenGL/libGL/Context.cpp
...@@ -1414,7 +1414,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params) ...@@ -1414,7 +1414,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
} }
break; break;
case GL_SAMPLES: case GL_SAMPLES:
*params = samples & ~1; *params = samples;
break; break;
} }
} }
...@@ -2687,14 +2687,14 @@ GLenum Context::getError() ...@@ -2687,14 +2687,14 @@ GLenum Context::getError()
int Context::getSupportedMultiSampleDepth(sw::Format format, int requested) int Context::getSupportedMultiSampleDepth(sw::Format format, int requested)
{ {
if(requested <= 1) if(requested <= 0)
{ {
return 1; return 0;
} }
if(requested == 2) if(requested <= 2)
{ {
return 2; return requested;
} }
return 4; return 4;
......
src/OpenGL/libGL/Renderbuffer.cpp
...@@ -358,7 +358,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples) ...@@ -358,7 +358,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples)
mHeight = height; mHeight = height;
this->format = format; this->format = format;
internalFormat = requestedFormat; internalFormat = requestedFormat;
mSamples = supportedSamples & ~1; mSamples = supportedSamples;
} }
Colorbuffer::~Colorbuffer() Colorbuffer::~Colorbuffer()
...@@ -418,7 +418,7 @@ DepthStencilbuffer::DepthStencilbuffer(int width, int height, GLsizei samples) ...@@ -418,7 +418,7 @@ DepthStencilbuffer::DepthStencilbuffer(int width, int height, GLsizei samples)
mHeight = height; mHeight = height;
format = GL_DEPTH24_STENCIL8_EXT; format = GL_DEPTH24_STENCIL8_EXT;
internalFormat = sw::FORMAT_D24S8; internalFormat = sw::FORMAT_D24S8;
mSamples = supportedSamples & ~1; mSamples = supportedSamples;
} }
DepthStencilbuffer::~DepthStencilbuffer() DepthStencilbuffer::~DepthStencilbuffer()
......
src/OpenGL/libGLES_CM/Context.cpp
...@@ -1260,7 +1260,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params) ...@@ -1260,7 +1260,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
} }
break; break;
case GL_SAMPLES: case GL_SAMPLES:
*params = samples & ~1; *params = samples;
break; break;
} }
} }
...@@ -2943,14 +2943,14 @@ GLenum Context::getError() ...@@ -2943,14 +2943,14 @@ GLenum Context::getError()
int Context::getSupportedMultiSampleDepth(sw::Format format, int requested) int Context::getSupportedMultiSampleDepth(sw::Format format, int requested)
{ {
if(requested <= 1) if(requested <= 0)
{ {
return 1; return 0;
} }
if(requested == 2) if(requested <= 2)
{ {
return 2; return requested;
} }
return 4; return 4;
......
src/OpenGL/libGLES_CM/Renderbuffer.cpp
...@@ -319,7 +319,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples) ...@@ -319,7 +319,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples)
mHeight = height; mHeight = height;
this->format = format; this->format = format;
internalFormat = requestedFormat; internalFormat = requestedFormat;
mSamples = supportedSamples & ~1; mSamples = supportedSamples;
} }
Colorbuffer::~Colorbuffer() Colorbuffer::~Colorbuffer()
...@@ -397,7 +397,7 @@ DepthStencilbuffer::DepthStencilbuffer(int width, int height, GLsizei samples) ...@@ -397,7 +397,7 @@ DepthStencilbuffer::DepthStencilbuffer(int width, int height, GLsizei samples)
mHeight = height; mHeight = height;
format = GL_DEPTH24_STENCIL8_OES; format = GL_DEPTH24_STENCIL8_OES;
internalFormat = sw::FORMAT_D24S8; internalFormat = sw::FORMAT_D24S8;
mSamples = supportedSamples & ~1; mSamples = supportedSamples;
} }
DepthStencilbuffer::~DepthStencilbuffer() DepthStencilbuffer::~DepthStencilbuffer()
......
src/OpenGL/libGLESv2/Context.cpp
...@@ -1994,7 +1994,7 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const ...@@ -1994,7 +1994,7 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const
} }
break; break;
case GL_SAMPLES: case GL_SAMPLES:
*params = samples & ~1; *params = samples;
break; break;
} }
} }
...@@ -3845,14 +3845,14 @@ GLenum Context::getError() ...@@ -3845,14 +3845,14 @@ GLenum Context::getError()
int Context::getSupportedMultiSampleDepth(sw::Format format, int requested) int Context::getSupportedMultiSampleDepth(sw::Format format, int requested)
{ {
if(requested <= 1) if(requested <= 0)
{ {
return 1; return 0;
} }
if(requested == 2) if(requested <= 2)
{ {
return 2; return requested;
} }
return 4; return 4;
......
src/OpenGL/libGLESv2/Renderbuffer.cpp
...@@ -464,7 +464,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples) ...@@ -464,7 +464,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples)
mHeight = height; mHeight = height;
this->format = format; this->format = format;
internalFormat = requestedFormat; internalFormat = requestedFormat;
mSamples = supportedSamples & ~1; mSamples = supportedSamples;
} }
Colorbuffer::~Colorbuffer() Colorbuffer::~Colorbuffer()
...@@ -542,7 +542,7 @@ DepthStencilbuffer::DepthStencilbuffer(int width, int height, GLsizei samples) ...@@ -542,7 +542,7 @@ DepthStencilbuffer::DepthStencilbuffer(int width, int height, GLsizei samples)
mHeight = height; mHeight = height;
format = GL_DEPTH24_STENCIL8_OES; format = GL_DEPTH24_STENCIL8_OES;
internalFormat = sw::FORMAT_D24S8; internalFormat = sw::FORMAT_D24S8;
mSamples = supportedSamples & ~1; mSamples = supportedSamples;
} }
DepthStencilbuffer::~DepthStencilbuffer() DepthStencilbuffer::~DepthStencilbuffer()
......
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