aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-01-26 11:07:35 -0700
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-02-13 18:46:39 +0100
commit8d38c7229827cf76a29f942725e1d907fd335dc1 (patch)
tree6f7f8e3168f8e98eb9827ec760351d9ab5e33f84
parent3fa0423c0230154c80d8f45d3232acc10b6e2014 (diff)
downloadmesa3d-8d38c7229827cf76a29f942725e1d907fd335dc1.tar.gz
osmesa: use _mesa_generate_mipmap() for mipmap generation, not meta
See previous commit for more info. Note: This is a candidate for the 9.0 branch. Reviewed-by: José Fonseca <jfonseca@vmware.com> (cherry picked from commit 2180f3297285e96d7b69e1cef4414461ba42b0d2)
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index e594548a630..0e770f9dd68 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -41,6 +41,7 @@
#include "main/framebuffer.h"
#include "main/imports.h"
#include "main/macros.h"
+#include "main/mipmap.h"
#include "main/mtypes.h"
#include "main/renderbuffer.h"
#include "swrast/swrast.h"
@@ -780,6 +781,8 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
ctx->Driver.MapRenderbuffer = osmesa_MapRenderbuffer;
ctx->Driver.UnmapRenderbuffer = osmesa_UnmapRenderbuffer;
+ ctx->Driver.GenerateMipmap = _mesa_generate_mipmap;
+
/* Extend the software rasterizer with our optimized line and triangle
* drawing functions.
*/