KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <anuj.phogat@gmail.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Anuj Phogat 2016-03-01 16:46:22 -08:00
parent 6d4ebbe9e5
commit de61849994
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/common/meta.h
View File

@ -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

5
src/mesa/drivers/common/meta_tex_subimage.c
View File

@ -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;

1
src/mesa/drivers/dri/i965/intel_tex_image.c
View File

@ -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;

2
src/mesa/drivers/dri/i965/intel_tex_subimage.c
View File

@ -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;