diff options
| author | 2014-11-20 16:38:06 -0800 | |
|---|---|---|
| committer | 2014-11-20 16:38:06 -0800 | |
| commit | f2235b6a48db2e16b52711570bf2a0d0cb0b0d90 (patch) | |
| tree | 159f121d1330bba957764704de13720e785f3e3b /libs/hwui/Program.cpp | |
| parent | cd24a6d70b54c79605e51fcc6a249313e9c25a51 (diff) | |
| parent | 57b641a2ed87f2827399c363053436cba88bee75 (diff) | |
resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
Diffstat (limited to 'libs/hwui/Program.cpp')
| -rw-r--r-- | libs/hwui/Program.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index 0dad0dcae641..e6fd2dc370c2 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -132,7 +132,7 @@ int Program::getUniform(const char* name) { } GLuint Program::buildShader(const char* source, GLenum type) { - ATRACE_CALL(); + ATRACE_NAME("Build GL Shader"); GLuint shader = glCreateShader(type); glShaderSource(shader, 1, &source, 0); |