diff options
| author | Jordan Justen <[email protected]> | 2013-01-12 14:56:49 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2013-01-14 20:50:31 -0800 |
| commit | ba34c1d5703f873e2f69fb1cca747f02ffba2ec9 (patch) | |
| tree | 5b5a9fa6b55fa289716128367a5c44ae48babc90 | |
| parent | 91ec623bd264a72579f438b18c8577764d346462 (diff) | |
copyteximage: Use Driver's AllocTextureImageBuffer instead of TexImage
Call Driver.AllocTextureImageBuffer rather than calling
Driver.TexImage with NULL data, format=GL_NONE and type=GL_NONE.
This avoids setting ctx->Unpack, which can lead to incorrectly
trying to upload data.
The GLES3 GTF program's packed_pixels_pbo test was triggering
an error for i965 with the previous code.
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/main/teximage.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index d62fea6e4f5..5e451e235d4 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3365,9 +3365,7 @@ copyteximage(struct gl_context *ctx, GLuint dims, border, internalFormat, texFormat); /* Allocate texture memory (no pixel data yet) */ - ctx->Driver.TexImage(ctx, dims, texImage, - GL_NONE, GL_NONE, - NULL, &ctx->Unpack); + ctx->Driver.AllocTextureImageBuffer(ctx, texImage); if (_mesa_clip_copytexsubimage(ctx, &dstX, &dstY, &srcX, &srcY, &width, &height)) { |