fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-31 13:30:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

radeon: Drop mapping we were doing around glGetTexImage().

Browse source 
It's handled by MapTextureImage() now.
This commit is contained in:
Eric Anholt 2011-07-31 21:09:04 -07:00
parent 6731c6cfb1
commit d1fda903ec
7 changed files with 0 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/r200/Makefile
View file

@ -27,7 +27,6 @@ RADEON_COMMON_SOURCES = \
radeon_span.c \ radeon_span.c \
radeon_texture.c \ radeon_texture.c \
radeon_tex_copy.c \ radeon_tex_copy.c \
radeon_tex_getimage.c \
radeon_tile.c radeon_tile.c
DRIVER_SOURCES = r200_context.c \ DRIVER_SOURCES = r200_context.c \

1
src/mesa/drivers/dri/r300/Makefile
View file

@ -27,7 +27,6 @@ RADEON_COMMON_SOURCES = \
radeon_span.c \ radeon_span.c \
radeon_texture.c \ radeon_texture.c \
radeon_tex_copy.c \ radeon_tex_copy.c \
radeon_tex_getimage.c \
radeon_tile.c radeon_tile.c
DRIVER_SOURCES = \ DRIVER_SOURCES = \

1
src/mesa/drivers/dri/r600/Makefile
View file

@ -27,7 +27,6 @@ RADEON_COMMON_SOURCES = \
radeon_span.c \ radeon_span.c \
radeon_texture.c \ radeon_texture.c \
radeon_tex_copy.c \ radeon_tex_copy.c \
radeon_tex_getimage.c \
radeon_tile.c radeon_tile.c
DRIVER_SOURCES = \ DRIVER_SOURCES = \

1
src/mesa/drivers/dri/radeon/Makefile
View file

@ -28,7 +28,6 @@ RADEON_COMMON_SOURCES = \
radeon_span.c \ radeon_span.c \
radeon_texture.c \ radeon_texture.c \
radeon_tex_copy.c \ radeon_tex_copy.c \
radeon_tex_getimage.c \
radeon_tile.c radeon_tile.c
DRIVER_SOURCES = \ DRIVER_SOURCES = \

76
src/mesa/drivers/dri/radeon/radeon_tex_getimage.c
View file

@ -1,76 +0,0 @@
/*
* Copyright (C) 2009 Maciej Cencora.
* Copyright (C) 2008 Nicolai Haehnle.
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
*
* The Weather Channel (TM) funded Tungsten Graphics to develop the
* initial release of the Radeon 8500 driver under the XFree86 license.
* This notice must be preserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial
* portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
#include "radeon_common_context.h"
#include "radeon_texture.h"
#include "radeon_mipmap_tree.h"
#include "main/texgetimage.h"
/**
* Need to map texture image into memory before copying image data,
* then unmap it.
*/
void
radeonGetTexImage(struct gl_context * ctx, GLenum target, GLint level,
GLenum format, GLenum type, GLvoid * pixels,
struct gl_texture_object *texObj,
struct gl_texture_image *texImage)
{
radeon_texture_image *image = get_radeon_texture_image(texImage);
radeon_print(RADEON_TEXTURE, RADEON_NORMAL,
"%s(%p, tex %p, image %p).\n",
__func__, ctx, texObj, image);
if (image->mt) {
radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
/* Map the texture image read-only */
if (radeon_bo_is_referenced_by_cs(image->mt->bo, rmesa->cmdbuf.cs)) {
radeon_print(RADEON_TEXTURE, RADEON_VERBOSE,
"%s: called for texture that is queued for GPU processing\n",
__func__);
radeon_firevertices(rmesa);
}
radeon_teximage_map(image, GL_FALSE);
} else {
/* Image hasn't been uploaded to a miptree yet */
assert(image->base.Base.Data);
}
_mesa_get_teximage(ctx, target, level, format, type, pixels,
texObj, texImage);
if (image->mt) {
radeon_teximage_unmap(image);
}
}

1
src/mesa/drivers/dri/radeon/radeon_texture.c
View file

@ -1191,7 +1191,6 @@ radeon_init_common_texture_funcs(radeonContextPtr radeon,
functions->TexSubImage3D = radeonTexSubImage3D; functions->TexSubImage3D = radeonTexSubImage3D;
functions->CompressedTexImage2D = radeonCompressedTexImage2D; functions->CompressedTexImage2D = radeonCompressedTexImage2D;
functions->CompressedTexSubImage2D = radeonCompressedTexSubImage2D; functions->CompressedTexSubImage2D = radeonCompressedTexSubImage2D;
functions->GetTexImage = radeonGetTexImage;
functions->GenerateMipmap = radeonGenerateMipmap; functions->GenerateMipmap = radeonGenerateMipmap;

5
src/mesa/drivers/dri/radeon/radeon_texture.h
View file

@ -117,11 +117,6 @@ void radeonTexSubImage3D(struct gl_context * ctx, GLenum target, GLint level,
struct gl_texture_object *texObj, struct gl_texture_object *texObj,
struct gl_texture_image *texImage); struct gl_texture_image *texImage);
void radeonGetTexImage(struct gl_context * ctx, GLenum target, GLint level,
GLenum format, GLenum type, GLvoid * pixels,
struct gl_texture_object *texObj,
struct gl_texture_image *texImage);
void radeonCopyTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level, void radeonCopyTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint xoffset, GLint yoffset,
GLint x, GLint y, GLint x, GLint y,