Commit 1fb3a755 by Nicolas Capens

Validate level index before validating level itself.

Change-Id: I4587cb845bf61c390942071546f2439ada618b9b Reviewed-on: https://swiftshader-review.googlesource.com/5530Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 7208e932
...@@ -1526,11 +1526,6 @@ void FramebufferTexture2DOES(GLenum target, GLenum attachment, GLenum textarget, ...@@ -1526,11 +1526,6 @@ void FramebufferTexture2DOES(GLenum target, GLenum attachment, GLenum textarget,
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
} }
if(tex->isCompressed(textarget, level))
{
return error(GL_INVALID_OPERATION);
}
switch(textarget) switch(textarget)
{ {
case GL_TEXTURE_2D: case GL_TEXTURE_2D:
...@@ -1547,6 +1542,11 @@ void FramebufferTexture2DOES(GLenum target, GLenum attachment, GLenum textarget, ...@@ -1547,6 +1542,11 @@ void FramebufferTexture2DOES(GLenum target, GLenum attachment, GLenum textarget,
{ {
return error(GL_INVALID_VALUE); return error(GL_INVALID_VALUE);
} }
if(tex->isCompressed(textarget, level))
{
return error(GL_INVALID_OPERATION);
}
} }
es1::Framebuffer *framebuffer = context->getFramebuffer(); es1::Framebuffer *framebuffer = context->getFramebuffer();
......
...@@ -2098,11 +2098,6 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL ...@@ -2098,11 +2098,6 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
} }
if(tex->isCompressed(textarget, level))
{
return error(GL_INVALID_OPERATION);
}
if((level != 0) && (context->getClientVersion() < 3)) if((level != 0) && (context->getClientVersion() < 3))
{ {
return error(GL_INVALID_VALUE); return error(GL_INVALID_VALUE);
...@@ -2112,6 +2107,11 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL ...@@ -2112,6 +2107,11 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
{ {
return error(GL_INVALID_VALUE); return error(GL_INVALID_VALUE);
} }
if(tex->isCompressed(textarget, level))
{
return error(GL_INVALID_OPERATION);
}
} }
es2::Framebuffer *framebuffer = nullptr; es2::Framebuffer *framebuffer = nullptr;
......
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