diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-03-12 13:12:44 -0700 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2014-03-12 13:12:44 -0700 |
commit | 92dc3fc52cf097bd105460cf377779bdcf146d62 (patch) | |
tree | aa1c6a8230541a45e941eb4c459b19b8487e08d3 /services/surfaceflinger/RenderEngine/Program.cpp | |
parent | 06ed9491418ce84e4272bf4201545fa6cfe3932e (diff) | |
download | frameworks_native-92dc3fc52cf097bd105460cf377779bdcf146d62.zip frameworks_native-92dc3fc52cf097bd105460cf377779bdcf146d62.tar.gz frameworks_native-92dc3fc52cf097bd105460cf377779bdcf146d62.tar.bz2 |
native frameworks: 64-bit compile issues
- Fix format (print/scanf)
- Suppress unused argument warning messages (bonus)
Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728
Diffstat (limited to 'services/surfaceflinger/RenderEngine/Program.cpp')
-rw-r--r-- | services/surfaceflinger/RenderEngine/Program.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/RenderEngine/Program.cpp b/services/surfaceflinger/RenderEngine/Program.cpp index 4a7fb58..0424e0c 100644 --- a/services/surfaceflinger/RenderEngine/Program.cpp +++ b/services/surfaceflinger/RenderEngine/Program.cpp @@ -25,7 +25,7 @@ namespace android { -Program::Program(const ProgramCache::Key& needs, const char* vertex, const char* fragment) +Program::Program(const ProgramCache::Key& /*needs*/, const char* vertex, const char* fragment) : mInitialized(false) { GLuint vertexId = buildShader(vertex, GL_VERTEX_SHADER); GLuint fragmentId = buildShader(fragment, GL_FRAGMENT_SHADER); @@ -112,7 +112,7 @@ GLuint Program::buildShader(const char* source, GLenum type) { return shader; } -String8& Program::dumpShader(String8& result, GLenum type) { +String8& Program::dumpShader(String8& result, GLenum /*type*/) { GLuint shader = GL_FRAGMENT_SHADER ? mFragmentShader : mVertexShader; GLint l; glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &l); |