Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Unified Diff: src/gpu/gl/GrGpuGL.h

Issue 16452007: Use all available texture units. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: use fHWBoundTextures->count() rather than glCaps()->maxFragmentTextureUnits() Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGLCaps.cpp ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGpuGL.h
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 094fca1f1b5d7a4ad379bb647da8bc32f7b19648..85cace71fbea4e822ddd34329c19465c4371bd52 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -227,7 +227,9 @@ private:
// determines valid stencil formats
void initStencilFormats();
- void setSpareTextureUnit();
+ // sets a texture unit to use for texture operations other than binding a texture to a program.
+ // ensures that such operations don't negatively interact with tracking bound textures.
+ void setScratchTextureUnit();
// bound is region that may be modified and therefore has to be resolved.
// NULL means whole target. Can be an empty rect.
@@ -425,7 +427,7 @@ private:
TriState fHWWriteToColor;
TriState fHWDitherEnabled;
GrRenderTarget* fHWBoundRenderTarget;
- GrTexture* fHWBoundTextures[GrDrawState::kNumStages];
+ SkTArray<GrTexture*, true> fHWBoundTextures;
///@}
// we record what stencil format worked last time to hopefully exit early
« no previous file with comments | « src/gpu/gl/GrGLCaps.cpp ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698