aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2007-12-11 12:25:42 +0000
committerKeith Whitwell <[email protected]>2007-12-11 13:14:56 +0000
commit89afc929f4e18165f1043c36844150e78f300cd5 (patch)
tree4bfd5bac63b913f0639018ddaeb77ecb5caf8978
parent60b8900b13a591e4a761baa0d6d40bcaca0c36d8 (diff)
gallium: remove dead pbo zcopy code
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 14f8d38def8..2c93a2f3dd9 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -487,18 +487,6 @@ try_pbo_upload(GLcontext *ctx,
-static GLboolean
-try_pbo_zcopy(GLcontext *ctx,
- struct st_texture_image *stImage,
- const struct gl_pixelstore_attrib *unpack,
- GLint internalFormat,
- GLint width, GLint height,
- GLenum format, GLenum type, const void *pixels)
-{
- return GL_FALSE;
-}
-
-
@@ -618,24 +606,6 @@ st_TexImage(GLcontext * ctx,
DBG("trying pbo upload\n");
- /* Attempt to texture directly from PBO data (zero copy upload).
- *
- * Currently disable as it can lead to worse as well as better
- * performance (in particular when pipe_region_cow() is
- * required).
- */
- if (stObj->pt == stImage->pt &&
- stObj->pt->first_level == level &&
- stObj->pt->last_level == level) {
-
- if (try_pbo_zcopy(intel, stImage, unpack,
- internalFormat,
- width, height, format, type, pixels)) {
-
- DBG("pbo zcopy upload succeeded\n");
- return;
- }
- }
/* Otherwise, attempt to use the blitter for PBO image uploads.
@@ -652,7 +622,6 @@ st_TexImage(GLcontext * ctx,
#else
(void) try_pbo_upload;
(void) check_pbo_format;
- (void) try_pbo_zcopy;
#endif