From 0ac9f25032a2e1bca52552972da4b55276fc1ae6 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 14 Jul 2016 14:25:19 -0600 Subject: 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 --- src/mesa/drivers/common/meta_copy_image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/common/meta_copy_image.c b/src/mesa/drivers/common/meta_copy_image.c index ebea4285c9a..e1c90a372d2 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; -- cgit v1.2.3