KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: remove dd_function_table::GetCompressedTexSubImage and clean it up 

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Marek Olšák 2017-12-13 19:14:36 +01:00
parent 2971f688e6
commit 581507f10a
5 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/common/driverfuncs.c
View File

@ -101,7 +101,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
driver->TestProxyTexImage = _mesa_test_proxy_teximage;
driver->CompressedTexImage = _mesa_store_compressed_teximage;
driver->CompressedTexSubImage = _mesa_store_compressed_texsubimage;
driver->GetCompressedTexSubImage = _mesa_GetCompressedTexSubImage_sw;
driver->BindTexture = NULL;
driver->NewTextureObject = _mesa_new_texture_object;
driver->DeleteTexture = _mesa_delete_texture_object;

10
src/mesa/main/dd.h
View File

@ -337,16 +337,6 @@ struct dd_function_table {
GLsizei width, GLsizei height, GLsizei depth,
GLenum format,
GLsizei imageSize, const GLvoid *data);
/**
* Called by glGetCompressedTexImage.
*/
void (*GetCompressedTexSubImage)(struct gl_context *ctx,
struct gl_texture_image *texImage,
GLint xoffset, GLint yoffset,
GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth,
GLvoid *data);
/*@}*/
/**

23
src/mesa/main/texgetimage.c
View File

@ -761,16 +761,15 @@ _mesa_GetTexSubImage_sw(struct gl_context *ctx,
/**
* This is the software fallback for Driver.GetCompressedTexSubImage().
* All error checking will have been done before this routine is called.
* This function assumes that all error checking has been done.
*/
void
_mesa_GetCompressedTexSubImage_sw(struct gl_context *ctx,
struct gl_texture_image *texImage,
GLint xoffset, GLint yoffset,
GLint zoffset, GLsizei width,
GLint height, GLint depth,
GLvoid *img)
static void
get_compressed_texsubimage_sw(struct gl_context *ctx,
struct gl_texture_image *texImage,
GLint xoffset, GLint yoffset,
GLint zoffset, GLsizei width,
GLint height, GLint depth,
GLvoid *img)
{
const GLuint dimensions =
_mesa_get_texture_dimensions(texImage->TexObject->Target);
@ -1661,9 +1660,9 @@ get_compressed_texture_image(struct gl_context *ctx,
texImage = texObj->Image[firstFace + i][level];
assert(texImage);
ctx->Driver.GetCompressedTexSubImage(ctx, texImage,
xoffset, yoffset, zoffset,
width, height, depth, pixels);
get_compressed_texsubimage_sw(ctx, texImage,
xoffset, yoffset, zoffset,
width, height, depth, pixels);
/* next cube face */
pixels = (GLubyte *) pixels + imageStride;

8
src/mesa/main/texgetimage.h
View File

@ -43,14 +43,6 @@ _mesa_GetTexSubImage_sw(struct gl_context *ctx,
GLenum format, GLenum type, GLvoid *pixels,
struct gl_texture_image *texImage);
extern void
_mesa_GetCompressedTexSubImage_sw(struct gl_context *ctx,
struct gl_texture_image *texImage,
GLint xoffset, GLint yoffset,
GLint zoffset, GLsizei width,
GLint height, GLint depth,
GLvoid *data);
extern void
_mesa_get_compressed_texture_image( struct gl_context *ctx,
struct gl_texture_object *texObj,

1
src/mesa/state_tracker/st_cb_texture.c
View File

@ -3180,7 +3180,6 @@ st_init_texture_functions(struct dd_function_table *functions)
/* compressed texture functions */
functions->CompressedTexImage = st_CompressedTexImage;
functions->GetCompressedTexSubImage = _mesa_GetCompressedTexSubImage_sw;
functions->NewTextureObject = st_NewTextureObject;
functions->NewTextureImage = st_NewTextureImage;