Index: gpu/command_buffer/service/gles2_cmd_decoder.cc |
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
index 413f3837569f711673d7946faa579bd5c68bc8f6..dedcd9d3ac4f5479f626450f920e71114f991280 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
@@ -14,6 +14,9 @@ |
#include "gpu/command_buffer/service/gl_utils.h" |
#include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
#include "gpu/command_buffer/service/gles2_cmd_validation.h" |
+#if defined(OS_LINUX) |
+#include "gpu/command_buffer/service/x_utils.h" |
+#endif |
namespace gpu { |
namespace gles2 { |
@@ -947,7 +950,6 @@ parse_error::ParseError GLES2DecoderImpl::DoCommand( |
parse_error::ParseError result; |
if (debug()) { |
// TODO(gman): Change output to something useful for NaCl. |
- const char* f = GetCommandName(command); |
printf("cmd: %s\n", GetCommandName(command)); |
} |
unsigned int command_index = command - kStartPoint - 1; |
@@ -1182,7 +1184,7 @@ void GLES2DecoderImpl::UpdateProgramInfo(GLuint program) { |
program, ii, max_len + 1, &length, &size, &type, name_buffer.get()); |
// TODO(gman): Should we check for error? |
GLint location = glGetAttribLocation(program, name_buffer.get()); |
- info->SetAttributeLocation(ii, num_attribs); |
+ info->SetAttributeLocation(ii, location); |
} |
} |
@@ -1722,4 +1724,3 @@ parse_error::ParseError GLES2DecoderImpl::HandleGetActiveAttrib( |
} // namespace gles2 |
} // namespace gpu |
- |