diff options
| author | Anuj Phogat <[email protected]> | 2016-03-01 16:46:22 -0800 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2016-03-02 15:06:46 -0800 |
| commit | de61849994dec48496a81540c384159da0e8371e (patch) | |
| tree | ca4c468083215a860cd7443197d3d26a5382261f /src/mesa/drivers | |
| parent | 6d4ebbe9e5798edee199671c0a98cbf2c5b042e2 (diff) | |
meta: Remove the 'allocate_storage' parameter in _mesa_meta_pbo_GetTexSubImage()
Texture is already allocated before calling this meta function. So,
the value of 'allocate_storage' passed to the function is always false.
Signed-off-by: Anuj Phogat <[email protected]>
Reviewed-by: Topi Pohjolainen <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/common/meta.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/common/meta_tex_subimage.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_image.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_subimage.c | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 60ae5f7577f..c2efa50a33d 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -536,7 +536,7 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, int xoffset, int yoffset, int zoffset, int width, int height, int depth, GLenum format, GLenum type, const void *pixels, - bool allocate_storage, bool create_pbo, + bool create_pbo, const struct gl_pixelstore_attrib *packing); extern bool diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c index 330289b6220..dfd3327dd55 100644 --- a/src/mesa/drivers/common/meta_tex_subimage.c +++ b/src/mesa/drivers/common/meta_tex_subimage.c @@ -175,7 +175,7 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, int xoffset, int yoffset, int zoffset, int width, int height, int depth, GLenum format, GLenum type, const void *pixels, - bool allocate_storage, bool create_pbo, + bool create_pbo, const struct gl_pixelstore_attrib *packing) { struct gl_buffer_object *pbo = NULL; @@ -227,9 +227,6 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, return false; } - if (allocate_storage) - ctx->Driver.AllocTextureImageBuffer(ctx, tex_image); - readFb = ctx->Driver.NewFramebuffer(ctx, 0xDEADBEEF); if (readFb == NULL) goto fail; diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c index e21c3ac543f..85259022c64 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_image.c +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c @@ -111,7 +111,6 @@ intelTexImage(struct gl_context * ctx, texImage->Width, texImage->Height, texImage->Depth, format, type, pixels, - false /*allocate_storage*/, tex_busy, unpack); if (ok) return; diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c index 573f701acdd..4849a4151e2 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c @@ -214,7 +214,7 @@ intelTexSubImage(struct gl_context * ctx, ok = _mesa_meta_pbo_TexSubImage(ctx, dims, texImage, xoffset, yoffset, zoffset, width, height, depth, format, type, - pixels, false, tex_busy, packing); + pixels, tex_busy, packing); if (ok) return; |