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

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

Issue 715983004: gpu: Change the hex code of conflicted _CHROMIUM macro (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run build_gles2_cmd_buffer.py Created 6 years, 1 month 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
Index: gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
index 1a0945a857b90475de4f692cb783ec9b03cd0d02..4c02f894d1777e0833e3c957322c5df326c84fa2 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -1126,7 +1126,7 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
},
{
0x84F5,
- "GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM",
+ "GL_TEXTURE_RECTANGLE_ARB",
},
{
0x882A,
@@ -1142,7 +1142,7 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
},
{
0x84F6,
- "GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM",
no sievers 2014/11/17 20:11:26 How come this is not in the new version of the fil
+ "GL_TEXTURE_BINDING_RECTANGLE_ARB",
},
{
0x80AB,
@@ -1945,6 +1945,10 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
"GL_FLOAT",
},
{
+ 0x84F8,
+ "GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM",
+ },
+ {
0x8DDF,
"GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT",
},

Powered by Google App Engine
This is Rietveld 408576698