AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@10398 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-07-27 07:01:06 +00:00
parent 149f4f5b40
commit aeefb2afe7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/gpu/GrTexture.h
View File

@ -43,11 +43,11 @@ public:
bool isSetFlag(GrTextureFlags flags) const {
return 0 != (fDesc.fFlags & flags);
}
void dirtyMipMaps(bool mipMapsDirty) {
fMipMapsDirty = mipMapsDirty;
}
bool mipMapsAreDirty() const {
return fMipMapsDirty;
}
@ -144,7 +144,7 @@ protected:
GrTexture(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc)
: INHERITED(gpu, isWrapped, desc)
, fRenderTarget(NULL)
, fRenderTarget(NULL)
, fMipMapsDirty(true) {
// only make sense if alloc size is pow2
@ -164,7 +164,7 @@ private:
// for this texture if the texture is power of two sized.
int fShiftFixedX;
int fShiftFixedY;
bool fMipMapsDirty;
virtual void internal_dispose() const SK_OVERRIDE;

6
src/gpu/gl/GrGpuGL.cpp
View File

@ -1553,7 +1553,7 @@ void GrGpuGL::flushRenderTarget(const SkIRect* bound) {
if (NULL == bound || !bound->isEmpty()) {
rt->flagAsNeedingResolve(bound);
}
GrTexture *texture = rt->asTexture();
if (texture) {
texture->dirtyMipMaps(true);
@ -2029,9 +2029,9 @@ void GrGpuGL::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTextur
};
newTexParams.fMinFilter = glMinFilterModes[params.filterMode()];
newTexParams.fMagFilter = glMagFilterModes[params.filterMode()];
#ifndef SKIA_IGNORE_GPU_MIPMAPS
if (params.filterMode() == GrTextureParams::kMipMap_FilterMode &&
if (params.filterMode() == GrTextureParams::kMipMap_FilterMode &&
texture->mipMapsAreDirty()) {
// GL_CALL(Hint(GR_GL_GENERATE_MIPMAP_HINT,GR_GL_NICEST));
GL_CALL(GenerateMipmap(GR_GL_TEXTURE_2D));