diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-11 16:40:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-11 16:40:28 -0700 |
| commit | 73b77af86131cd4dad16c32ba1898028ce08da36 (patch) | |
| tree | 7407fd116e6d9f45fcd8b53c67d91ac078a5d802 | |
| parent | a0e28da5ab4505b45780b9932d7fad85898ebce6 (diff) | |
| parent | 98173a277f8bd6d53d6ff9f7ff09e084f2666fc1 (diff) | |
| download | frameworks_base-73b77af86131cd4dad16c32ba1898028ce08da36.zip frameworks_base-73b77af86131cd4dad16c32ba1898028ce08da36.tar.gz frameworks_base-73b77af86131cd4dad16c32ba1898028ce08da36.tar.bz2 | |
Merge "Delete shaders after a compile error. Also disable extra logging."
| -rw-r--r-- | libs/hwui/Program.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/ProgramCache.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index dbae38e..6528d91 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -51,6 +51,8 @@ Program::Program(const char* vertex, const char* fragment) { LOGE("Error while linking shaders: %s", log); delete log; } + glDeleteShader(vertexShader); + glDeleteShader(fragmentShader); glDeleteProgram(id); } diff --git a/libs/hwui/ProgramCache.h b/libs/hwui/ProgramCache.h index 54850ee..fa4b8c4 100644 --- a/libs/hwui/ProgramCache.h +++ b/libs/hwui/ProgramCache.h @@ -35,7 +35,7 @@ namespace uirenderer { /////////////////////////////////////////////////////////////////////////////// // Debug -#define DEBUG_PROGRAM_CACHE 1 +#define DEBUG_PROGRAM_CACHE 0 // Debug #if DEBUG_PROGRAM_CACHE |