radeon: Refactor the common texture hook setup to common code.

Reviewed-by: Brian Paul <brianp@vmware.com>

2 files changed, 6 insertions, 54 deletions

diff --git a/src/mesa/drivers/dri/r600/evergreen_tex.c b/src/mesa/drivers/dri/r600/evergreen_tex.c
index b560ac4ea40..7222e5a1987 100644
--- a/src/mesa/drivers/dri/r600/evergreen_tex.c
+++ b/src/mesa/drivers/dri/r600/evergreen_tex.c
@@ -1657,34 +1657,12 @@ void evergreenInitTextureFuncs(radeonContextPtr radeon, struct dd_function_table
 	/* Note: we only plug in the functions we implement in the driver
 	 * since _mesa_init_driver_functions() was already called.
 	 */
-	functions->NewTextureImage = radeonNewTextureImage;
-	functions->FreeTextureImageBuffer = radeonFreeTextureImageBuffer;
-	functions->MapTexture = radeonMapTexture;
-	functions->UnmapTexture = radeonUnmapTexture;
-
-	functions->ChooseTextureFormat = radeonChooseTextureFormat_mesa;
-	functions->TexImage1D = radeonTexImage1D;
-	functions->TexImage2D = radeonTexImage2D;
-	functions->TexImage3D = radeonTexImage3D;
-	functions->TexSubImage1D = radeonTexSubImage1D;
-	functions->TexSubImage2D = radeonTexSubImage2D;
-	functions->TexSubImage3D = radeonTexSubImage3D;
-	functions->GetTexImage = radeonGetTexImage;
-	functions->GetCompressedTexImage = radeonGetCompressedTexImage;
+
+	radeon_init_common_texture_funcs(radeon, functions);
+
 	functions->NewTextureObject = evergreenNewTextureObject;
 	functions->DeleteTexture = evergreenDeleteTexture;
 	functions->IsTextureResident = driIsTextureResident;
 
 	functions->TexParameter = evergreenTexParameter;
-
-	functions->CompressedTexImage2D = radeonCompressedTexImage2D;
-	functions->CompressedTexSubImage2D = radeonCompressedTexSubImage2D;
-
-	if (radeon->radeonScreen->kernel_mm) {
-		functions->CopyTexSubImage2D = radeonCopyTexSubImage2D;
-	}
-
-	functions->GenerateMipmap = radeonGenerateMipmap;
-
-	driInitTextureFormats();
 }
diff --git a/src/mesa/drivers/dri/r600/r600_tex.c b/src/mesa/drivers/dri/r600/r600_tex.c
index f1d704e41c1..ac704e65101 100644
--- a/src/mesa/drivers/dri/r600/r600_tex.c
+++ b/src/mesa/drivers/dri/r600/r600_tex.c
@@ -446,38 +446,12 @@ void r600InitTextureFuncs(radeonContextPtr radeon, struct dd_function_table *fun
 	/* Note: we only plug in the functions we implement in the driver
 	 * since _mesa_init_driver_functions() was already called.
 	 */
-	functions->NewTextureImage = radeonNewTextureImage;
-	functions->FreeTextureImageBuffer = radeonFreeTextureImageBuffer;
-	functions->MapTexture = radeonMapTexture;
-	functions->UnmapTexture = radeonUnmapTexture;
-
-	functions->ChooseTextureFormat = radeonChooseTextureFormat_mesa;
-	functions->TexImage1D = radeonTexImage1D;
-	functions->TexImage2D = radeonTexImage2D;
-	functions->TexImage3D = radeonTexImage3D;
-	functions->TexSubImage1D = radeonTexSubImage1D;
-	functions->TexSubImage2D = radeonTexSubImage2D;
-	functions->TexSubImage3D = radeonTexSubImage3D;
-	functions->GetTexImage = radeonGetTexImage;
-	functions->GetCompressedTexImage = radeonGetCompressedTexImage;
+
+	radeon_init_common_texture_funcs(radeon, functions);
+
 	functions->NewTextureObject = r600NewTextureObject;
 	functions->DeleteTexture = r600DeleteTexture;
 	functions->IsTextureResident = driIsTextureResident;
 
 	functions->TexParameter = r600TexParameter;
-
-	functions->CompressedTexImage2D = radeonCompressedTexImage2D;
-	functions->CompressedTexSubImage2D = radeonCompressedTexSubImage2D;
-
-	if (radeon->radeonScreen->kernel_mm) {
-		functions->CopyTexSubImage2D = radeonCopyTexSubImage2D;
-	}
-
-	functions->GenerateMipmap = radeonGenerateMipmap;
-
-#if FEATURE_OES_EGL_image
-	functions->EGLImageTargetTexture2D = radeon_image_target_texture_2d;
-#endif
-
-	driInitTextureFormats();
 }