fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Convert depth glGetTexImage() to using MapTextureImage().

Browse source 
Tested-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Brian Paul 2011-07-31 20:59:16 -07:00 • committed by Eric Anholt
parent 59348722b7
commit 429b45e7c0
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/main/texgetimage.c
View file

@ -71,14 +71,13 @@ type_with_negative_values(GLenum type)
static void
get_tex_depth(struct gl_context *ctx, GLuint dimensions,
GLenum format, GLenum type, GLvoid *pixels,
const struct gl_texture_image *texImage)
struct gl_texture_image *texImage)
{
const GLint width = texImage->Width;
const GLint height = texImage->Height;
const GLint depth = texImage->Depth;
GLint img, row;
GLfloat *depthRow = (GLfloat *) malloc(width * sizeof(GLfloat));
const GLint texelSize = _mesa_get_format_bytes(texImage->TexFormat);
if (!depthRow) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage");
@ -86,18 +85,24 @@ get_tex_depth(struct gl_context *ctx, GLuint dimensions,
}
for (img = 0; img < depth; img++) {
GLubyte *srcMap;
GLint srcRowStride;
/* map src texture buffer */
ctx->Driver.MapTextureImage(ctx, texImage, img,
0, 0, width, height, GL_MAP_READ_BIT,
&srcMap, &srcRowStride);
for (row = 0; row < height; row++) {
void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
width, height, format, type,
img, row, 0);
const GLubyte *src = (GLubyte *) texImage->Data +
(texImage->ImageOffsets[img] +
texImage->RowStride * row) * texelSize;
const GLubyte *src = srcMap + row * srcRowStride;
_mesa_unpack_float_z_row(texImage->TexFormat, width, src, depthRow);
_mesa_pack_depth_span(ctx, width, dest, type, depthRow, &ctx->Pack);
}
ctx->Driver.UnmapTextureImage(ctx, texImage, img);
}
free(depthRow);

3
src/mesa/state_tracker/st_cb_texture.c
View file

@ -950,7 +950,8 @@ st_GetTexImage(struct gl_context * ctx, GLenum target, GLint level,
return;
}
if (format == GL_DEPTH_STENCIL_EXT) {
if (format == GL_DEPTH_STENCIL ||
format == GL_DEPTH_COMPONENT) {
do_map = GL_FALSE;
}