projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/glsl: remove unused uses_builtin_functions field
[mesa.git]
/
src
/
mesa
/
main
/
mipmap.c
diff --git
a/src/mesa/main/mipmap.c
b/src/mesa/main/mipmap.c
index 5ff53f4265cc8bb9568b842eed9c3f9a41ebb69d..05c13fbba0cb58fe34c6a6e11e6166bbed2e4871 100644
(file)
--- a/
src/mesa/main/mipmap.c
+++ b/
src/mesa/main/mipmap.c
@@
-38,8
+38,8
@@
#include "image.h"
#include "macros.h"
#include "util/half_float.h"
#include "image.h"
#include "macros.h"
#include "util/half_float.h"
-#include "
../../gallium/auxiliary/util/u_
format_rgb9e5.h"
-#include "
../../gallium/auxiliary/util/u_
format_r11g11b10f.h"
+#include "
util/
format_rgb9e5.h"
+#include "
util/
format_r11g11b10f.h"
@@
-1777,7
+1777,8
@@
_mesa_next_mipmap_level_size(GLenum target, GLint border,
}
if ((srcHeight - 2 * border > 1) &&
}
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 {
*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) &&
}
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 {
*dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
}
else {