mesa: remove dd_function_table::GetCompressedTexSubImage and clean it up
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
parent
2971f688e6
commit
581507f10a
|
@ -101,7 +101,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
|
||||||
driver->TestProxyTexImage = _mesa_test_proxy_teximage;
|
driver->TestProxyTexImage = _mesa_test_proxy_teximage;
|
||||||
driver->CompressedTexImage = _mesa_store_compressed_teximage;
|
driver->CompressedTexImage = _mesa_store_compressed_teximage;
|
||||||
driver->CompressedTexSubImage = _mesa_store_compressed_texsubimage;
|
driver->CompressedTexSubImage = _mesa_store_compressed_texsubimage;
|
||||||
driver->GetCompressedTexSubImage = _mesa_GetCompressedTexSubImage_sw;
|
|
||||||
driver->BindTexture = NULL;
|
driver->BindTexture = NULL;
|
||||||
driver->NewTextureObject = _mesa_new_texture_object;
|
driver->NewTextureObject = _mesa_new_texture_object;
|
||||||
driver->DeleteTexture = _mesa_delete_texture_object;
|
driver->DeleteTexture = _mesa_delete_texture_object;
|
||||||
|
|
|
@ -337,16 +337,6 @@ struct dd_function_table {
|
||||||
GLsizei width, GLsizei height, GLsizei depth,
|
GLsizei width, GLsizei height, GLsizei depth,
|
||||||
GLenum format,
|
GLenum format,
|
||||||
GLsizei imageSize, const GLvoid *data);
|
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);
|
|
||||||
/*@}*/
|
/*@}*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -761,11 +761,10 @@ _mesa_GetTexSubImage_sw(struct gl_context *ctx,
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the software fallback for Driver.GetCompressedTexSubImage().
|
* This function assumes that all error checking has been done.
|
||||||
* All error checking will have been done before this routine is called.
|
|
||||||
*/
|
*/
|
||||||
void
|
static void
|
||||||
_mesa_GetCompressedTexSubImage_sw(struct gl_context *ctx,
|
get_compressed_texsubimage_sw(struct gl_context *ctx,
|
||||||
struct gl_texture_image *texImage,
|
struct gl_texture_image *texImage,
|
||||||
GLint xoffset, GLint yoffset,
|
GLint xoffset, GLint yoffset,
|
||||||
GLint zoffset, GLsizei width,
|
GLint zoffset, GLsizei width,
|
||||||
|
@ -1661,7 +1660,7 @@ get_compressed_texture_image(struct gl_context *ctx,
|
||||||
texImage = texObj->Image[firstFace + i][level];
|
texImage = texObj->Image[firstFace + i][level];
|
||||||
assert(texImage);
|
assert(texImage);
|
||||||
|
|
||||||
ctx->Driver.GetCompressedTexSubImage(ctx, texImage,
|
get_compressed_texsubimage_sw(ctx, texImage,
|
||||||
xoffset, yoffset, zoffset,
|
xoffset, yoffset, zoffset,
|
||||||
width, height, depth, pixels);
|
width, height, depth, pixels);
|
||||||
|
|
||||||
|
|
|
@ -43,14 +43,6 @@ _mesa_GetTexSubImage_sw(struct gl_context *ctx,
|
||||||
GLenum format, GLenum type, GLvoid *pixels,
|
GLenum format, GLenum type, GLvoid *pixels,
|
||||||
struct gl_texture_image *texImage);
|
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
|
extern void
|
||||||
_mesa_get_compressed_texture_image( struct gl_context *ctx,
|
_mesa_get_compressed_texture_image( struct gl_context *ctx,
|
||||||
struct gl_texture_object *texObj,
|
struct gl_texture_object *texObj,
|
||||||
|
|
|
@ -3180,7 +3180,6 @@ st_init_texture_functions(struct dd_function_table *functions)
|
||||||
|
|
||||||
/* compressed texture functions */
|
/* compressed texture functions */
|
||||||
functions->CompressedTexImage = st_CompressedTexImage;
|
functions->CompressedTexImage = st_CompressedTexImage;
|
||||||
functions->GetCompressedTexSubImage = _mesa_GetCompressedTexSubImage_sw;
|
|
||||||
|
|
||||||
functions->NewTextureObject = st_NewTextureObject;
|
functions->NewTextureObject = st_NewTextureObject;
|
||||||
functions->NewTextureImage = st_NewTextureImage;
|
functions->NewTextureImage = st_NewTextureImage;
|
||||||
|
|
Loading…
Reference in New Issue