Mesa (master): mesa: add proxy texture targets in _mesa_next_mipmap_level_size()
Brian Paul
brianp at kemper.freedesktop.org
Fri Jul 15 20:38:02 UTC 2016
Module: Mesa
Branch: master
Commit: 39183ea971a9fd3fc001b5a5a43df1c890525681
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39183ea971a9fd3fc001b5a5a43df1c890525681
Author: Brian Paul <brianp at vmware.com>
Date: Thu Jul 14 15:49:40 2016 -0600
mesa: add proxy texture targets in _mesa_next_mipmap_level_size()
So we can use it for computing size of proxy textures.
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
---
src/mesa/main/mipmap.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 5ff53f4..996e3f8 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1777,7 +1777,8 @@ _mesa_next_mipmap_level_size(GLenum target, GLint border,
}
if ((srcHeight - 2 * border > 1) &&
- (target != GL_TEXTURE_1D_ARRAY_EXT)) {
+ target != GL_TEXTURE_1D_ARRAY_EXT &&
+ target != GL_PROXY_TEXTURE_1D_ARRAY_EXT) {
*dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;
}
else {
@@ -1785,8 +1786,10 @@ _mesa_next_mipmap_level_size(GLenum target, GLint border,
}
if ((srcDepth - 2 * border > 1) &&
- (target != GL_TEXTURE_2D_ARRAY_EXT &&
- target != GL_TEXTURE_CUBE_MAP_ARRAY)) {
+ target != GL_TEXTURE_2D_ARRAY_EXT &&
+ target != GL_PROXY_TEXTURE_2D_ARRAY_EXT &&
+ target != GL_TEXTURE_CUBE_MAP_ARRAY &&
+ target != GL_PROXY_TEXTURE_CUBE_MAP_ARRAY) {
*dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
}
else {
More information about the mesa-commit
mailing list