summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/util/u_texture.h
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2013-11-19 18:54:53 +0000
committerJosé Fonseca <jfonseca@vmware.com>2013-11-20 07:12:59 +0000
commit060159820c05c4e9a9b577844387555b11092391 (patch)
tree11a641ae427c40618a87cbaccf841c17b00edc39 /src/gallium/auxiliary/util/u_texture.h
parent15d8e05e1e98a9bfd5a365d0fda222668f24261f (diff)
downloadexternal_mesa3d-060159820c05c4e9a9b577844387555b11092391.zip
external_mesa3d-060159820c05c4e9a9b577844387555b11092391.tar.gz
external_mesa3d-060159820c05c4e9a9b577844387555b11092391.tar.bz2
u_gen_mipmap: Use untampered cubemap texture coords when generating mipmaps.
It's not necessary to scale down cubemap texture coords when generating mipmaps: we are doing a 2x minification therefore it's guaranteed that the texture coords will always be at least 1 texel away of the edges. Scaling down can actually be harmful, as it may cause artefacts when generating mipmaps with nearest filtering. Sample points will lie exactly in the middle each 2x2 texels, so the scaling factor was causing different texels to be take on each quadrant of the cube face. This is apparent with a 1x1 checkerboard pattern in the base mipmap level: instead of next mipmap level receiving a constant color throughout the face, it will have different colors for each quadrant of the face. The behaviour for blits is left untouched for now, but the cubemap texture coord scaling hack should be reconsidered eventually. Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/util/u_texture.h')
-rw-r--r--src/gallium/auxiliary/util/u_texture.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_texture.h b/src/gallium/auxiliary/util/u_texture.h
index 93b2f1e..b1c8c70 100644
--- a/src/gallium/auxiliary/util/u_texture.h
+++ b/src/gallium/auxiliary/util/u_texture.h
@@ -27,6 +27,8 @@
#ifndef U_TEXTURE_H
#define U_TEXTURE_H
+#include "pipe/p_compiler.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -44,7 +46,8 @@ extern "C" {
*/
void util_map_texcoords2d_onto_cubemap(unsigned face,
const float *in_st, unsigned in_stride,
- float *out_str, unsigned out_stride);
+ float *out_str, unsigned out_stride,
+ boolean allow_scale);
#ifdef __cplusplus