summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/common
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2016-07-14 14:25:19 -0600
committerBrian Paul <brianp@vmware.com>2016-07-15 14:24:34 -0600
commit0ac9f25032a2e1bca52552972da4b55276fc1ae6 (patch)
tree9148c7e375915da492c85176e50ae763e9b093da /src/mesa/drivers/common
parente477d92c94d6415d2844f68766adf5339aebe7bf (diff)
downloadexternal_mesa3d-0ac9f25032a2e1bca52552972da4b55276fc1ae6.zip
external_mesa3d-0ac9f25032a2e1bca52552972da4b55276fc1ae6.tar.gz
external_mesa3d-0ac9f25032a2e1bca52552972da4b55276fc1ae6.tar.bz2
mesa: add numLevels, numSamples to Driver.TestProxyTexImage()
So that the function can work properly with glTexStorage(), where we know how many mipmap levels there are. And so we can compute storage for MSAA textures. Also, remove the obsolete texture border parameter. A subsequent patch will update _mesa_test_proxy_teximage() to use these new parameters. Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Diffstat (limited to 'src/mesa/drivers/common')
-rw-r--r--src/mesa/drivers/common/meta_copy_image.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/common/meta_copy_image.c b/src/mesa/drivers/common/meta_copy_image.c
index ebea428..e1c90a3 100644
--- a/src/mesa/drivers/common/meta_copy_image.c
+++ b/src/mesa/drivers/common/meta_copy_image.c
@@ -101,9 +101,9 @@ make_view(struct gl_context *ctx, struct gl_texture_image *tex_image,
0, internal_format,
GL_NONE, GL_NONE);
- if (!ctx->Driver.TestProxyTexImage(ctx, tex_obj->Target, 0, tex_format,
- tex_image->Width, tex_image->Height,
- tex_image->Depth, 0)) {
+ if (!ctx->Driver.TestProxyTexImage(ctx, tex_obj->Target, 1, 0, tex_format,
+ 1, tex_image->Width, tex_image->Height,
+ tex_image->Depth)) {
_mesa_DeleteTextures(1, view_tex_name);
*view_tex_name = 0;
return false;