summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_copy.c6
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_image.c13
2 files changed, 5 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index 673b8fa6a1..6603bcf9a2 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -169,9 +169,6 @@ do_copy_texsubimage(struct intel_context *intel,
}
-
-
-
void
intelCopyTexImage1D(GLcontext * ctx, GLenum target, GLint level,
GLenum internalFormat,
@@ -218,6 +215,7 @@ intelCopyTexImage1D(GLcontext * ctx, GLenum target, GLint level,
width, border);
}
+
void
intelCopyTexImage2D(GLcontext * ctx, GLenum target, GLint level,
GLenum internalFormat,
@@ -291,7 +289,6 @@ intelCopyTexSubImage1D(GLcontext * ctx, GLenum target, GLint level,
}
-
void
intelCopyTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,
GLint xoffset, GLint yoffset,
@@ -305,7 +302,6 @@ intelCopyTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,
_mesa_select_tex_image(ctx, texObj, target, level);
GLenum internalFormat = texImage->InternalFormat;
-
/* Need to check texture is compatible with source format.
*/
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index ddbb13e74a..ff5f614988 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -248,7 +248,6 @@ try_pbo_upload(struct intel_context *intel,
}
-
static GLboolean
try_pbo_zcopy(struct intel_context *intel,
struct intel_texture_image *intelImage,
@@ -293,10 +292,6 @@ try_pbo_zcopy(struct intel_context *intel,
}
-
-
-
-
static void
intelTexImage(GLcontext * ctx,
GLint dims,
@@ -463,8 +458,6 @@ intelTexImage(GLcontext * ctx,
DBG("pbo upload failed\n");
}
-
-
/* intelCopyTexImage calls this function with pixels == NULL, with
* the expectation that the mipmap tree will be set up but nothing
* more will be done. This is where those calls return:
@@ -557,6 +550,7 @@ intelTexImage(GLcontext * ctx,
}
}
+
void
intelTexImage3D(GLcontext * ctx,
GLenum target, GLint level,
@@ -589,6 +583,7 @@ intelTexImage2D(GLcontext * ctx,
format, type, pixels, unpack, texObj, texImage, 0, 0);
}
+
void
intelTexImage1D(GLcontext * ctx,
GLenum target, GLint level,
@@ -604,6 +599,7 @@ intelTexImage1D(GLcontext * ctx,
format, type, pixels, unpack, texObj, texImage, 0, 0);
}
+
void intelCompressedTexImage2D( GLcontext *ctx, GLenum target, GLint level,
GLint internalFormat,
GLint width, GLint height, GLint border,
@@ -616,6 +612,7 @@ void intelCompressedTexImage2D( GLcontext *ctx, GLenum target, GLint level,
0, 0, data, &ctx->Unpack, texObj, texImage, imageSize, 1);
}
+
/**
* Need to map texture image into memory before copying image data,
* then unmap it.
@@ -680,8 +677,6 @@ intelGetTexImage(GLcontext * ctx, GLenum target, GLint level,
{
intel_get_tex_image(ctx, target, level, format, type, pixels,
texObj, texImage, 0);
-
-
}
void