/**************************************************************************
- *
+ *
* Copyright 2008 VMware, Inc.
* All Rights Reserved.
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
**************************************************************************/
-#include "main/imports.h"
+#include "main/errors.h"
+
#include "main/mipmap.h"
#include "main/teximage.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
#include "util/u_gen_mipmap.h"
#include "st_debug.h"
#include "st_context.h"
#include "st_texture.h"
+#include "st_util.h"
#include "st_gen_mipmap.h"
#include "st_cb_bitmap.h"
#include "st_cb_texture.h"
-/**
- * Compute the expected number of mipmap levels in the texture given
- * the width/height/depth of the base image and the GL_TEXTURE_BASE_LEVEL/
- * GL_TEXTURE_MAX_LEVEL settings. This will tell us how many mipmap
- * levels should be generated.
- */
-static GLuint
-compute_num_levels(struct gl_context *ctx,
- struct gl_texture_object *texObj,
- GLenum target)
-{
- const struct gl_texture_image *baseImage;
- GLuint numLevels;
-
- baseImage = _mesa_get_tex_image(ctx, texObj, target, texObj->BaseLevel);
-
- numLevels = texObj->BaseLevel + baseImage->MaxNumLevels;
- numLevels = MIN2(numLevels, (GLuint) texObj->MaxLevel + 1);
- if (texObj->Immutable)
- numLevels = MIN2(numLevels, texObj->NumLevels);
- assert(numLevels >= 1);
-
- return numLevels;
-}
-
-
/**
* Called via ctx->Driver.GenerateMipmap().
*/
struct st_context *st = st_context(ctx);
struct st_texture_object *stObj = st_texture_object(texObj);
struct pipe_resource *pt = st_get_texobj_resource(texObj);
- const uint baseLevel = texObj->BaseLevel;
+ uint baseLevel = texObj->BaseLevel;
enum pipe_format format;
uint lastLevel, first_layer, last_layer;
if (!pt)
return;
+ if (texObj->Immutable)
+ baseLevel += texObj->MinLevel;
+
/* not sure if this ultimately actually should work,
but we're not supporting multisampled textures yet. */
assert(pt->nr_samples < 2);
/* find expected last mipmap level to generate*/
- lastLevel = compute_num_levels(ctx, texObj, target) - 1;
+ lastLevel = _mesa_compute_num_levels(ctx, texObj, target) - 1;
+
+ if (texObj->Immutable)
+ lastLevel += texObj->MinLevel;
if (lastLevel == 0)
return;
st_flush_bitmap_cache(st);
+ st_invalidate_readpix_cache(st);
/* The texture isn't in a "complete" state yet so set the expected
* lastLevel here, since it won't get done in st_finalize_texture().
*
* After this, we'll have all mipmap levels in one resource.
*/
- st_finalize_texture(ctx, st->pipe, texObj);
+ st_finalize_texture(ctx, st->pipe, texObj, 0);
}
pt = stObj->pt;
else
format = pt->format;
+ if (texObj->Sampler.sRGBDecode == GL_SKIP_DECODE_EXT)
+ format = util_format_linear(format);
+
/* First see if the driver supports hardware mipmap generation,
* if not then generate the mipmap by rendering/texturing.
* If that fails, use the software fallback.