summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/textureview.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2016-07-14 14:25:19 -0600
committerBrian Paul <[email protected]>2016-07-15 14:24:34 -0600
commit0ac9f25032a2e1bca52552972da4b55276fc1ae6 (patch)
tree9148c7e375915da492c85176e50ae763e9b093da /src/mesa/main/textureview.c
parente477d92c94d6415d2844f68766adf5339aebe7bf (diff)
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 <[email protected]>
Diffstat (limited to 'src/mesa/main/textureview.c')
-rw-r--r--src/mesa/main/textureview.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/textureview.c b/src/mesa/main/textureview.c
index 9b584cdba68..ed66c179589 100644
--- a/src/mesa/main/textureview.c
+++ b/src/mesa/main/textureview.c
@@ -714,8 +714,9 @@ _mesa_TextureView(GLuint texture, GLenum target, GLuint origtexture,
return;
}
- sizeOK = ctx->Driver.TestProxyTexImage(ctx, target, 0, texFormat,
- width, height, depth, 0);
+ sizeOK = ctx->Driver.TestProxyTexImage(ctx, target, 1, 0, texFormat,
+ origTexImage->NumSamples,
+ width, height, depth);
if (!sizeOK) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTextureView(invalid texture size)");