<div dir="ltr">Comments have been addressed: <a href="http://cgit.freedesktop.org/~ldeks/mesa/commit/?h=adsa-textures&id=9c55b528e24650753049a11b05f754ab02a0eba4">http://cgit.freedesktop.org/~ldeks/mesa/commit/?h=adsa-textures&id=9c55b528e24650753049a11b05f754ab02a0eba4</a> </div><div class="gmail_extra"> <div class="gmail_quote">On Wed, Dec 31, 2014 at 11:27 AM, Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Mon, Dec 15, 2014 at 5:22 PM, Laura Ekstrand <<a href="mailto:laura@jlekstrand.net">laura@jlekstrand.net</a>> wrote: > --- > src/mapi/glapi/gen/ARB_direct_state_access.xml | 7 + > src/mesa/main/texgetimage.c | 169 ++++++++++++++++++------- > src/mesa/main/texgetimage.h | 12 ++ > 3 files changed, 143 insertions(+), 45 deletions(-) > > diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml > index 605c614..df335eb 100644 > --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml > +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml > @@ -157,6 +157,13 @@ > <param name="pixels" type="GLvoid *" /> > </function> > > + <function name="GetCompressedTextureImage" offset="assign"> > + <param name="texture" type="GLuint" /> > + <param name="level" type="GLint" /> > + <param name="bufSize" type="GLsizei" /> > + <param name="pixels" type="GLvoid *" /> > + </function> > + > <function name="GetTextureLevelParameterfv" offset="assign"> > <param name="texture" type="GLuint" /> > <param name="level" type="GLint" /> > diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c > index 32b5ace..3cc3df6 100644 > --- a/src/mesa/main/texgetimage.c > +++ b/src/mesa/main/texgetimage.c > @@ -1148,45 +1148,37 @@ _mesa_GetTextureImage( GLuint texture, GLint level, GLenum format, > * \return GL_TRUE if any error, GL_FALSE if no errors. > */ > static GLboolean > -getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, > - GLint level, GLsizei clientMemSize, GLvoid *img) > +getcompressedteximage_error_check(struct gl_context *ctx, > + struct gl_texture_object *texObj, > + struct gl_texture_image *texImage, > + GLenum target, > + GLint level, GLsizei clientMemSize, > + GLvoid *img, bool dsa) > { > - struct gl_texture_object *texObj; > - struct gl_texture_image *texImage; > + assert(texObj); > + assert(texImage); > const GLint maxLevels = _mesa_max_texture_levels(ctx, target); > GLuint compressedSize, dimensions; > > - if (!legal_getteximage_target(ctx, target, false)) { > - _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImage(target=0x%x)", > - target); > + if (!legal_getteximage_target(ctx, target, dsa)) { > + _mesa_error(ctx, GL_INVALID_ENUM, > + "glGetCompressedTex%sImage(target=0x%x)", > + dsa ? "ture" : "", target); > return GL_TRUE; > } > > assert(maxLevels != 0); > if (level < 0 || level >= maxLevels) { > _mesa_error(ctx, GL_INVALID_VALUE, > - "glGetCompressedTexImageARB(bad level = %d)", level); > - return GL_TRUE; > - } > - > - texObj = _mesa_get_current_tex_object(ctx, target); > - if (!texObj) { > - _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB(target)"); > - return GL_TRUE; > - } > - > - texImage = _mesa_select_tex_image(ctx, texObj, target, level); > - > - if (!texImage) { > - /* probably invalid mipmap level */ > - _mesa_error(ctx, GL_INVALID_VALUE, > - "glGetCompressedTexImageARB(level)"); > + "glGetCompressedTex%sImage(bad level = %d)", > + dsa ? "ture" : "", level); > return GL_TRUE; > } > > if (!_mesa_is_format_compressed(texImage->TexFormat)) { > _mesa_error(ctx, GL_INVALID_OPERATION, > - "glGetCompressedTexImageARB(texture is not compressed)"); > + "glGetCompressedTex%sImage(texture is not compressed)", > + dsa ? "ture" : ""); > return GL_TRUE; > } > > @@ -1198,8 +1190,9 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, > /* Check for invalid pixel storage modes */ > dimensions = _mesa_get_texture_dimensions(texImage->TexObject->Target); > if (!_mesa_compressed_pixel_storage_error_check(ctx, dimensions, > - &ctx->Pack, > - "glGetCompressedTexImageARB")) { > + &ctx->Pack, dsa ? > + "glGetCompressedTextureImage": > + "glGetCompressedTexImage")) { > return GL_TRUE; > } > > @@ -1207,8 +1200,9 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, > /* do bounds checking on writing to client memory */ > if (clientMemSize < (GLsizei) compressedSize) { > _mesa_error(ctx, GL_INVALID_OPERATION, > - "glGetnCompressedTexImageARB(out of bounds access:" > - " bufSize (%d) is too small)", clientMemSize); > + "%s(out of bounds access: bufSize (%d) is too small)", > + dsa ? "glGetCompressedTextureImage" : > + "glGetnCompressedTexImageARB", clientMemSize); > return GL_TRUE; > } > } else { > @@ -1216,14 +1210,16 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, > if ((const GLubyte *) img + compressedSize > > (const GLubyte *) ctx->Pack.BufferObj->Size) { > _mesa_error(ctx, GL_INVALID_OPERATION, > - "glGetCompressedTexImage(out of bounds PBO access)"); > + "glGetCompressedTex%sImage(out of bounds PBO access)", > + dsa ? "ture" : ""); > return GL_TRUE; > } > > /* make sure PBO is not mapped */ > if (_mesa_check_disallowed_mapping(ctx->Pack.BufferObj)) { > _mesa_error(ctx, GL_INVALID_OPERATION, > - "glGetCompressedTexImage(PBO is mapped)"); > + "glGetCompressedTex%sImage(PBO is mapped)", > + dsa ? "ture" : ""); > return GL_TRUE; > } > } > @@ -1231,49 +1227,132 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, > return GL_FALSE; > } > > - > -void GLAPIENTRY > -_mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, > - GLvoid *img) > +/** Implements glGetnCompressedTexImageARB, glGetCompressedTexImage, and > + * glGetCompressedTextureImage. > + * > + * texImage must be passed in because glGetCompressedTexImage must handle the > + * target GL_TEXTURE_CUBE_MAP. > + */ > +void > +_mesa_get_compressed_texture_image( struct gl_context *ctx, > + struct gl_texture_object *texObj, > + struct gl_texture_image *texImage, > + GLenum target, GLint level, > + GLsizei bufSize, GLvoid *pixels, > + bool dsa ) > { > - struct gl_texture_object *texObj; > - struct gl_texture_image *texImage; > - GET_CURRENT_CONTEXT(ctx); > + assert(texObj); > + assert(texImage); > > FLUSH_VERTICES(ctx, 0); > > - if (getcompressedteximage_error_check(ctx, target, level, bufSize, img)) { > + if (getcompressedteximage_error_check(ctx, texObj, texImage, target, level, > + bufSize, pixels, dsa)) { > return; > } > > - if (!_mesa_is_bufferobj(ctx->Pack.BufferObj) && !img) { > + if (!_mesa_is_bufferobj(ctx->Pack.BufferObj) && !pixels) { > /* not an error, do nothing */ > return; > } > > - texObj = _mesa_get_current_tex_object(ctx, target); > - texImage = _mesa_select_tex_image(ctx, texObj, target, level); > - > if (_mesa_is_zero_size_texture(texImage)) > return; > > if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE)) { > _mesa_debug(ctx, > - "glGetCompressedTexImage(tex %u) format = %s, w=%d, h=%d\n", > - texObj->Name, > + "glGetCompressedTex%sImage(tex %u) format = %s, w=%d, h=%d\n", > + dsa ? "ture" : "", texObj->Name, > _mesa_get_format_name(texImage->TexFormat), > texImage->Width, texImage->Height); > } > > _mesa_lock_texture(ctx, texObj); > { > - ctx->Driver.GetCompressedTexImage(ctx, texImage, img); > + ctx->Driver.GetCompressedTexImage(ctx, texImage, pixels); > } > _mesa_unlock_texture(ctx, texObj); > } > > void GLAPIENTRY > +_mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, > + GLvoid *img) > +{ > + struct gl_texture_object *texObj; > + struct gl_texture_image *texImage; > + GET_CURRENT_CONTEXT(ctx); > + > + texObj = _mesa_get_current_tex_object(ctx, target); > + if (!texObj) > + return; > + > + texImage = _mesa_select_tex_image(ctx, texObj, target, level); > + if (!texImage) > + return; > + > + _mesa_get_compressed_texture_image(ctx, texObj, texImage, target, level, > + bufSize, img, false); > +} > + > +void GLAPIENTRY > _mesa_GetCompressedTexImage(GLenum target, GLint level, GLvoid *img) > { > _mesa_GetnCompressedTexImageARB(target, level, INT_MAX, img); > } > + > +/** > + * Get compressed texture image. > + * > + * \param texture texture name. > + * \param level image level. > + * \param bufSize size of the pixels data buffer. > + * \param pixels returned pixel data. > + */ > +void GLAPIENTRY > +_mesa_GetCompressedTextureImage( GLuint texture, GLint level, > + GLsizei bufSize, GLvoid *pixels ) > +{ > + struct gl_texture_object *texObj; > + struct gl_texture_image *texImage; > + int i; > + GLint image_stride; > + GET_CURRENT_CONTEXT(ctx); > + > + texObj = _mesa_lookup_texture_err(ctx, texture, > + "glGetCompressedTextureImage"); > + if (!texObj) > + return; > + > + /* Must special case GL_TEXTURE_CUBE_MAP. */ </div></div>Must handle > + if (texObj->Target == GL_TEXTURE_CUBE_MAP) { > + assert(texObj->NumLayers >= 6); > + > + /* Copy each face. */ > + for (i = 0; i < 6; ++i) { /* For each face. */ duplicate comment. <div><div class="h5">> + texImage = texObj->Image[i][level]; > + if (!texImage) > + return; > + > + _mesa_get_compressed_texture_image(ctx, texObj, texImage, > + texObj->Target, level, > + bufSize, pixels, true); > + > + /* Compressed images don't have a client format */ > + image_stride = _mesa_format_image_size(texImage->TexFormat, > + texImage->Width, > + texImage->Height, 1); > + > + pixels += image_stride; > + bufSize -= image_stride; > + } > + } > + else { > + texImage = _mesa_select_tex_image(ctx, texObj, texObj->Target, level); > + if (!texImage) > + return; > + > + _mesa_get_compressed_texture_image(ctx, texObj, texImage, > + texObj->Target, level, bufSize, > + pixels, true); > + } > +} > diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h > index 085f580..1413923 100644 > --- a/src/mesa/main/texgetimage.h > +++ b/src/mesa/main/texgetimage.h > @@ -54,6 +54,14 @@ _mesa_get_texture_image( struct gl_context *ctx, > GLint level, GLenum format, GLenum type, > GLsizei bufSize, GLvoid *pixels, bool dsa ); > > +extern void > +_mesa_get_compressed_texture_image( struct gl_context *ctx, > + struct gl_texture_object *texObj, > + struct gl_texture_image *texImage, > + GLenum target, GLint level, > + GLsizei bufSize, GLvoid *pixels, > + bool dsa ); > + > > extern void GLAPIENTRY > _mesa_GetTexImage( GLenum target, GLint level, > @@ -72,4 +80,8 @@ extern void GLAPIENTRY > _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, > GLvoid *img); > > +extern void GLAPIENTRY > +_mesa_GetCompressedTextureImage(GLuint texture, GLint level, GLsizei bufSize, > + GLvoid *pixels); > + > #endif /* TEXGETIMAGE_H */ > -- > 2.1.0 > </div></div>> _______________________________________________ > mesa-dev mailing list > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>