Rename GrTAllocator to GrTBlockList
GrTAllocator implies relatively limited use cases, while GrTBlockLinkedList
helps clarify the underlying data structure (and its associated advantages
and disadvantages). I am not beholden to the name, so am happy to have
a discussion on alternatives like GrTLinkedList or GrTBlockList or
GrTBlockArray.
Change-Id: I5b10801d8593991d5e804c4074a81efb1dd110ee
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304396
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/gl/GrGLProgramDataManager.h b/src/gpu/gl/GrGLProgramDataManager.h
index 5306e61..cd9719d 100644
--- a/src/gpu/gl/GrGLProgramDataManager.h
+++ b/src/gpu/gl/GrGLProgramDataManager.h
@@ -10,7 +10,7 @@
#include "include/gpu/gl/GrGLTypes.h"
#include "src/gpu/GrShaderVar.h"
-#include "src/gpu/GrTAllocator.h"
+#include "src/gpu/GrTBlockList.h"
#include "src/gpu/glsl/GrGLSLProgramDataManager.h"
#include "src/gpu/glsl/GrGLSLUniformHandler.h"
@@ -35,11 +35,11 @@
GrGLint fLocation;
};
- // This uses an allocator rather than array so that the GrShaderVars don't move in memory
- // after they are inserted. Users of GrGLShaderBuilder get refs to the vars and ptrs to their
- // name strings. Otherwise, we'd have to hand out copies.
- typedef GrTAllocator<GLUniformInfo> UniformInfoArray;
- typedef GrTAllocator<VaryingInfo> VaryingInfoArray;
+ // This uses a GrTBlockList rather than SkTArray/std::vector so that the GrShaderVars
+ // don't move in memory after they are inserted. Users of GrGLShaderBuilder get refs to the vars
+ // and ptrs to their name strings. Otherwise, we'd have to hand out copies.
+ typedef GrTBlockList<GLUniformInfo> UniformInfoArray;
+ typedef GrTBlockList<VaryingInfo> VaryingInfoArray;
GrGLProgramDataManager(GrGLGpu*, GrGLuint programID, const UniformInfoArray&,
const VaryingInfoArray&);