Skip to content

S
swiftshader
Commit 0c6ac93c by Nicolas Capens Committed by Nicolas Capens
Options

Refactor glReadPixels validation.

Bug swiftshader:104 Change-Id: I2e5ab18f400035ec3f2125fb001643ca1125c565 Reviewed-on: https://swiftshader-review.googlesource.com/18148Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 0ccc71d2
Showing with 64 additions and 35 deletions
src/OpenGL/common/Image.cpp
...@@ -155,8 +155,7 @@ namespace gl ...@@ -155,8 +155,7 @@ namespace gl
switch(type) switch(type)
{ {
case GL_UNSIGNED_SHORT: return sw::FORMAT_D16; case GL_UNSIGNED_SHORT: return sw::FORMAT_D16;
case GL_UNSIGNED_INT_24_8_OES: return sw::FORMAT_D24S8; case GL_UNSIGNED_INT_24_8_OES: return sw::FORMAT_D24X8;
case GL_UNSIGNED_INT: return sw::FORMAT_D32;
case GL_FLOAT: return sw::FORMAT_D32F_LOCKABLE; case GL_FLOAT: return sw::FORMAT_D32F_LOCKABLE;
default: UNREACHABLE(type); default: UNREACHABLE(type);
} }
......
src/OpenGL/libGLESv2/Context.cpp
...@@ -3298,9 +3298,9 @@ void Context::readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum ...@@ -3298,9 +3298,9 @@ void Context::readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
} }
if(!IsValidReadPixelsFormatType(framebuffer, format, type)) if(!ValidateReadPixelsFormatType(framebuffer, format, type))
{ {
return error(GL_INVALID_OPERATION); return;
} }
GLsizei outputWidth = (mState.packParameters.rowLength > 0) ? mState.packParameters.rowLength : width; GLsizei outputWidth = (mState.packParameters.rowLength > 0) ? mState.packParameters.rowLength : width;
...@@ -3335,14 +3335,12 @@ void Context::readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum ...@@ -3335,14 +3335,12 @@ void Context::readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
} }
sw::RectF rect((float)x, (float)y, (float)(x + width), (float)(y + height)); sw::SliceRectF srcRect((float)x, (float)y, (float)(x + width), (float)(y + height), 0);
sw::Rect dstRect(0, 0, width, height); sw::SliceRect dstRect(0, 0, width, height, 0);
rect.clip(0.0f, 0.0f, (float)renderTarget->getWidth(), (float)renderTarget->getHeight()); srcRect.clip(0.0f, 0.0f, (float)renderTarget->getWidth(), (float)renderTarget->getHeight());
sw::Surface *externalSurface = sw::Surface::create(width, height, 1, gl::ConvertReadFormatType(format, type), pixels, outputPitch, outputPitch * outputHeight); sw::Surface *externalSurface = sw::Surface::create(width, height, 1, gl::ConvertReadFormatType(format, type), pixels, outputPitch, outputPitch * outputHeight);
sw::SliceRectF sliceRect(rect); device->blit(renderTarget, srcRect, externalSurface, dstRect, false, false, false);
sw::SliceRect dstSliceRect(dstRect);
device->blit(renderTarget, sliceRect, externalSurface, dstSliceRect, false, false, false);
externalSurface->lockExternal(0, 0, 0, sw::LOCK_READONLY, sw::PUBLIC); externalSurface->lockExternal(0, 0, 0, sw::LOCK_READONLY, sw::PUBLIC);
externalSurface->unlockExternal(); externalSurface->unlockExternal();
delete externalSurface; delete externalSurface;
......
src/OpenGL/libGLESv2/Framebuffer.cpp
...@@ -354,7 +354,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples) ...@@ -354,7 +354,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
} }
else if(IsTextureTarget(mColorbufferType[i])) else if(IsTextureTarget(mColorbufferType[i]))
{ {
GLenum format = colorbuffer->getFormat(); GLint format = colorbuffer->getFormat();
if(!IsColorRenderable(format)) if(!IsColorRenderable(format))
{ {
...@@ -668,7 +668,7 @@ GLenum Framebuffer::getDepthReadType() const ...@@ -668,7 +668,7 @@ GLenum Framebuffer::getDepthReadType() const
case GL_DEPTH_COMPONENT32_OES: return GL_UNSIGNED_INT; case GL_DEPTH_COMPONENT32_OES: return GL_UNSIGNED_INT;
case GL_DEPTH_COMPONENT32F: return GL_FLOAT; case GL_DEPTH_COMPONENT32F: return GL_FLOAT;
case GL_DEPTH24_STENCIL8: return GL_UNSIGNED_INT_24_8_OES; case GL_DEPTH24_STENCIL8: return GL_UNSIGNED_INT_24_8_OES;
case GL_DEPTH32F_STENCIL8: return GL_FLOAT; case GL_DEPTH32F_STENCIL8: return GL_FLOAT_32_UNSIGNED_INT_24_8_REV;
default: default:
UNREACHABLE(depthbuffer->getFormat()); UNREACHABLE(depthbuffer->getFormat());
} }
......
src/OpenGL/libGLESv2/utilities.cpp
...@@ -623,7 +623,7 @@ namespace es2 ...@@ -623,7 +623,7 @@ namespace es2
return true; return true;
} }
bool IsValidReadPixelsFormatType(const Framebuffer *framebuffer, GLenum format, GLenum type) bool ValidateReadPixelsFormatType(const Framebuffer *framebuffer, GLenum format, GLenum type)
{ {
// GL_NV_read_depth // GL_NV_read_depth
if(format == GL_DEPTH_COMPONENT) if(format == GL_DEPTH_COMPONENT)
...@@ -632,25 +632,56 @@ namespace es2 ...@@ -632,25 +632,56 @@ namespace es2
if(!depthbuffer) if(!depthbuffer)
{ {
return false; return error(GL_INVALID_OPERATION, false);
} }
GLint internalformat = depthbuffer->getFormat();
switch(type) switch(type)
{ {
case GL_UNSIGNED_SHORT: case GL_UNSIGNED_SHORT:
case GL_UNSIGNED_INT_24_8_OES:
switch(internalformat)
{
case GL_DEPTH_COMPONENT16:
case GL_DEPTH_COMPONENT24:
case GL_DEPTH_COMPONENT32_OES:
case GL_DEPTH24_STENCIL8:
break;
case GL_DEPTH_COMPONENT32F:
case GL_DEPTH32F_STENCIL8:
return error(GL_INVALID_OPERATION, false);
default:
UNREACHABLE(internalformat);
return error(GL_INVALID_OPERATION, false);
}
case GL_FLOAT: case GL_FLOAT:
return true; switch(internalformat)
{
case GL_DEPTH_COMPONENT32F:
case GL_DEPTH32F_STENCIL8:
break;
case GL_DEPTH_COMPONENT16:
case GL_DEPTH_COMPONENT24:
case GL_DEPTH_COMPONENT32_OES:
case GL_DEPTH24_STENCIL8:
return error(GL_INVALID_OPERATION, false);
default:
UNREACHABLE(internalformat);
return error(GL_INVALID_OPERATION, false);
}
default: default:
UNIMPLEMENTED(); return error(GL_INVALID_ENUM, false);
return false;
} }
return true;
} }
Renderbuffer *colorbuffer = framebuffer->getReadColorbuffer(); Renderbuffer *colorbuffer = framebuffer->getReadColorbuffer();
if(!colorbuffer) if(!colorbuffer)
{ {
return false; return error(GL_INVALID_OPERATION, false);
} }
GLint internalformat = colorbuffer->getFormat(); GLint internalformat = colorbuffer->getFormat();
...@@ -730,14 +761,12 @@ namespace es2 ...@@ -730,14 +761,12 @@ namespace es2
} }
} }
return false; return error(GL_INVALID_OPERATION, false);
} }
bool IsDepthTexture(GLenum format) bool IsDepthTexture(GLint format)
{ {
return format == GL_DEPTH_COMPONENT || return format == GL_DEPTH_COMPONENT16 ||
format == GL_DEPTH_STENCIL_OES ||
format == GL_DEPTH_COMPONENT16 ||
format == GL_DEPTH_COMPONENT24 || format == GL_DEPTH_COMPONENT24 ||
format == GL_DEPTH_COMPONENT32_OES || format == GL_DEPTH_COMPONENT32_OES ||
format == GL_DEPTH_COMPONENT32F || format == GL_DEPTH_COMPONENT32F ||
...@@ -745,12 +774,11 @@ namespace es2 ...@@ -745,12 +774,11 @@ namespace es2
format == GL_DEPTH32F_STENCIL8; format == GL_DEPTH32F_STENCIL8;
} }
bool IsStencilTexture(GLenum format) bool IsStencilTexture(GLint format)
{ {
return format == GL_STENCIL_INDEX_OES || return format == GL_DEPTH24_STENCIL8 ||
format == GL_DEPTH_STENCIL_OES || format == GL_DEPTH32F_STENCIL8 ||
format == GL_DEPTH24_STENCIL8 || format == GL_STENCIL_INDEX8;
format == GL_DEPTH32F_STENCIL8;
} }
bool IsCubemapTextureTarget(GLenum target) bool IsCubemapTextureTarget(GLenum target)
...@@ -1142,8 +1170,9 @@ namespace es2 ...@@ -1142,8 +1170,9 @@ namespace es2
case GL_UNSIGNED_INT_2_10_10_10_REV: case GL_UNSIGNED_INT_2_10_10_10_REV:
case GL_UNSIGNED_INT_10F_11F_11F_REV: case GL_UNSIGNED_INT_10F_11F_11F_REV:
case GL_UNSIGNED_INT_5_9_9_9_REV: case GL_UNSIGNED_INT_5_9_9_9_REV:
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
return 4; return 4;
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
return 8;
default: default:
UNREACHABLE(type); UNREACHABLE(type);
break; break;
......
src/OpenGL/libGLESv2/utilities.h
...@@ -51,9 +51,9 @@ namespace es2 ...@@ -51,9 +51,9 @@ namespace es2
GLenum ValidateSubImageParams(bool compressed, bool copy, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLenum ValidateSubImageParams(bool compressed, bool copy, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, Texture *texture); GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, Texture *texture);
bool ValidateCopyFormats(GLenum textureFormat, GLenum colorbufferFormat); bool ValidateCopyFormats(GLenum textureFormat, GLenum colorbufferFormat);
bool IsValidReadPixelsFormatType(const Framebuffer *framebuffer, GLenum format, GLenum type); bool ValidateReadPixelsFormatType(const Framebuffer *framebuffer, GLenum format, GLenum type);
bool IsDepthTexture(GLenum format); bool IsDepthTexture(GLint format);
bool IsStencilTexture(GLenum format); bool IsStencilTexture(GLint format);
bool IsCubemapTextureTarget(GLenum target); bool IsCubemapTextureTarget(GLenum target);
int CubeFaceIndex(GLenum cubeTarget); int CubeFaceIndex(GLenum cubeTarget);
bool IsTextureTarget(GLenum target); bool IsTextureTarget(GLenum target);
......
src/Renderer/Blitter.cpp
...@@ -389,7 +389,8 @@ namespace sw ...@@ -389,7 +389,8 @@ namespace sw
c.x = Float(Int((*Pointer<UShort>(element)))); c.x = Float(Int((*Pointer<UShort>(element))));
break; break;
case FORMAT_D24S8: case FORMAT_D24S8:
c.x = Float(Int((*Pointer<UInt>(element)))); case FORMAT_D24X8:
c.x = Float(Int((*Pointer<UInt>(element) & UInt(0xFFFFFF00)) >> 8));
break; break;
case FORMAT_D32: case FORMAT_D32:
c.x = Float(Int((*Pointer<UInt>(element)))); c.x = Float(Int((*Pointer<UInt>(element))));
...@@ -755,7 +756,8 @@ namespace sw ...@@ -755,7 +756,8 @@ namespace sw
*Pointer<UShort>(element) = UShort(RoundInt(Float(c.x))); *Pointer<UShort>(element) = UShort(RoundInt(Float(c.x)));
break; break;
case FORMAT_D24S8: case FORMAT_D24S8:
*Pointer<UInt>(element) = UInt(RoundInt(Float(c.x))); case FORMAT_D24X8:
*Pointer<UInt>(element) = UInt(RoundInt(Float(c.x)) << 8);
break; break;
case FORMAT_D32: case FORMAT_D32:
*Pointer<UInt>(element) = UInt(RoundInt(Float(c.x))); *Pointer<UInt>(element) = UInt(RoundInt(Float(c.x)));
...@@ -1050,6 +1052,7 @@ namespace sw ...@@ -1050,6 +1052,7 @@ namespace sw
scale = vector(0xFFFF, 0.0f, 0.0f, 0.0f); scale = vector(0xFFFF, 0.0f, 0.0f, 0.0f);
break; break;
case FORMAT_D24S8: case FORMAT_D24S8:
case FORMAT_D24X8:
scale = vector(0xFFFFFF, 0.0f, 0.0f, 0.0f); scale = vector(0xFFFFFF, 0.0f, 0.0f, 0.0f);
break; break;
case FORMAT_D32: case FORMAT_D32:
......
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