33f6b3f6ee
Dirty GL-generated mipmaps whenever an sRGB texture is used with a new value for TEXTURE_SRGB_DECODE. Add a new test rectangle to the gamma GM that tests that textures are correctly converted to linear before filtering when generating mipmaps. Added a new unit test that alternates how a texture is interpreted (sRGB or not), to verify that we rebuild mipmaps when needed, and that we get the correct results out in both modes. This test originally failed on four of our bots producing incorrect mips in three different ways. I'm not real surprised, but it looks like we can't rely on glGenerateMipmap to do the right thing, in conjunction with TEXTURE_SRGB_DECODE. Instead, actually create mip-chains using a series of draw calls. (My first attempt used glBlitFramebuffer, and that still had bugs on several bots). This approach appears to work correctly on any device that fully supports sRGB. Because the mipmap draws are fairly destructive to state, I had to hoist them out of bindTexture. That means adding a second pass over the texture accesses in the processor, at the very beginning of flush. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1840473002 Review-Url: https://codereview.chromium.org/2007973002
75 lines
1.8 KiB
C++
75 lines
1.8 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef GrTexture_DEFINED
|
|
#define GrTexture_DEFINED
|
|
|
|
#include "GrSurface.h"
|
|
#include "SkPoint.h"
|
|
#include "SkRefCnt.h"
|
|
|
|
class GrTextureParams;
|
|
class GrTexturePriv;
|
|
|
|
class GrTexture : virtual public GrSurface {
|
|
public:
|
|
GrTexture* asTexture() override { return this; }
|
|
const GrTexture* asTexture() const override { return this; }
|
|
GrSLType samplerType() const { return fSamplerType; }
|
|
|
|
/**
|
|
* Return the native ID or handle to the texture, depending on the
|
|
* platform. e.g. on OpenGL, return the texture ID.
|
|
*/
|
|
virtual GrBackendObject getTextureHandle() const = 0;
|
|
|
|
/**
|
|
* This function indicates that the texture parameters (wrap mode, filtering, ...) have been
|
|
* changed externally to Skia.
|
|
*/
|
|
virtual void textureParamsModified() = 0;
|
|
|
|
#ifdef SK_DEBUG
|
|
void validate() const {
|
|
this->INHERITED::validate();
|
|
this->validateDesc();
|
|
}
|
|
#endif
|
|
|
|
/** Access methods that are only to be used within Skia code. */
|
|
inline GrTexturePriv texturePriv();
|
|
inline const GrTexturePriv texturePriv() const;
|
|
|
|
protected:
|
|
GrTexture(GrGpu*, const GrSurfaceDesc&, GrSLType, bool wasMipMapDataProvided);
|
|
|
|
void validateDesc() const;
|
|
|
|
private:
|
|
void computeScratchKey(GrScratchKey*) const override;
|
|
size_t onGpuMemorySize() const override;
|
|
void dirtyMipMaps(bool mipMapsDirty, bool sRGBCorrect);
|
|
|
|
enum MipMapsStatus {
|
|
kNotAllocated_MipMapsStatus,
|
|
kAllocated_MipMapsStatus,
|
|
kValid_MipMapsStatus
|
|
};
|
|
|
|
GrSLType fSamplerType;
|
|
MipMapsStatus fMipMapsStatus;
|
|
int fMaxMipMapLevel;
|
|
bool fMipMapsAreSRGBCorrect;
|
|
|
|
friend class GrTexturePriv;
|
|
|
|
typedef GrSurface INHERITED;
|
|
};
|
|
|
|
#endif
|