Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Unified Diff: gpu/command_buffer/common/gles2_cmd_format_autogen.h

Issue 9150022: Revert r118525 / Re-land r118240 - the build failure was a flake. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/client/gles2_lib.h ('k') | gpu/command_buffer/common/gles2_cmd_format_test_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/common/gles2_cmd_format_autogen.h
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index fd82beab38865d7dceb6e3dddebe86a8f2eda0b1..b86740fefc5cdedda9a371c5e258199b2e0ab91a 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8482,7 +8482,7 @@ struct TexStorage2DEXT {
}
void Init(
- GLenum _target, GLsizei _levels, GLint _internalFormat, GLsizei _width,
+ GLenum _target, GLsizei _levels, GLenum _internalFormat, GLsizei _width,
GLsizei _height) {
SetHeader();
target = _target;
@@ -8493,7 +8493,7 @@ struct TexStorage2DEXT {
}
void* Set(
- void* cmd, GLenum _target, GLsizei _levels, GLint _internalFormat,
+ void* cmd, GLenum _target, GLsizei _levels, GLenum _internalFormat,
GLsizei _width, GLsizei _height) {
static_cast<ValueType*>(
cmd)->Init(_target, _levels, _internalFormat, _width, _height);
@@ -8503,7 +8503,7 @@ struct TexStorage2DEXT {
gpu::CommandHeader header;
uint32 target;
int32 levels;
- int32 internalFormat;
+ uint32 internalFormat;
int32 width;
int32 height;
};
« no previous file with comments | « gpu/command_buffer/client/gles2_lib.h ('k') | gpu/command_buffer/common/gles2_cmd_format_test_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698