Skip to content

A
angle
Commit 3c7439b6 by Jamie Madill Committed by Commit Bot
Options

Fix style inconsistency in packed enum json.

Bug: angleproject:2574 Bug: angleproject:2169 Change-Id: I33387bd47979cda7d5239c7128252f860c721a3b Reviewed-on: https://chromium-review.googlesource.com/1067113 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent c22f5134
Showing with 68 additions and 68 deletions
src/common/packed_gl_enums.json
...@@ -59,34 +59,34 @@ ...@@ -59,34 +59,34 @@
}, },
"HintSetting": "HintSetting":
{ {
"DontCare" : "GL_DONT_CARE", "DontCare": "GL_DONT_CARE",
"Fastest" : "GL_FASTEST", "Fastest": "GL_FASTEST",
"Nicest" : "GL_NICEST" "Nicest": "GL_NICEST"
}, },
"LogicalOperation": "LogicalOperation":
{ {
"And" : "GL_AND", "And": "GL_AND",
"AndInverted" : "GL_AND_INVERTED", "AndInverted": "GL_AND_INVERTED",
"AndReverse" : "GL_AND_REVERSE", "AndReverse": "GL_AND_REVERSE",
"Clear" : "GL_CLEAR", "Clear": "GL_CLEAR",
"Copy" : "GL_COPY", "Copy": "GL_COPY",
"CopyInverted" : "GL_COPY_INVERTED", "CopyInverted": "GL_COPY_INVERTED",
"Equiv" : "GL_EQUIV", "Equiv": "GL_EQUIV",
"Invert" : "GL_INVERT", "Invert": "GL_INVERT",
"Nand" : "GL_NAND", "Nand": "GL_NAND",
"Noop" : "GL_NOOP", "Noop": "GL_NOOP",
"Nor" : "GL_NOR", "Nor": "GL_NOR",
"Or" : "GL_OR", "Or": "GL_OR",
"OrInverted" : "GL_OR_INVERTED", "OrInverted": "GL_OR_INVERTED",
"OrReverse" : "GL_OR_REVERSE", "OrReverse": "GL_OR_REVERSE",
"Set" : "GL_SET", "Set": "GL_SET",
"Xor" : "GL_XOR" "Xor": "GL_XOR"
}, },
"MatrixType": "MatrixType":
{ {
"Modelview" : "GL_MODELVIEW", "Modelview": "GL_MODELVIEW",
"Projection" : "GL_PROJECTION", "Projection": "GL_PROJECTION",
"Texture" : "GL_TEXTURE" "Texture": "GL_TEXTURE"
}, },
"QueryType": "QueryType":
{ {
...@@ -107,42 +107,42 @@ ...@@ -107,42 +107,42 @@
}, },
"ShadingModel": "ShadingModel":
{ {
"Flat" : "GL_FLAT", "Flat": "GL_FLAT",
"Smooth" : "GL_SMOOTH" "Smooth": "GL_SMOOTH"
}, },
"TextureCombine": "TextureCombine":
{ {
"Add" : "GL_ADD", "Add": "GL_ADD",
"AddSigned" : "GL_ADD_SIGNED", "AddSigned": "GL_ADD_SIGNED",
"Dot3Rgb" : "GL_DOT3_RGB", "Dot3Rgb": "GL_DOT3_RGB",
"Dot3Rgba" : "GL_DOT3_RGBA", "Dot3Rgba": "GL_DOT3_RGBA",
"Interpolate" : "GL_INTERPOLATE", "Interpolate": "GL_INTERPOLATE",
"Modulate" : "GL_MODULATE", "Modulate": "GL_MODULATE",
"Replace" : "GL_REPLACE", "Replace": "GL_REPLACE",
"Subtract" : "GL_SUBTRACT" "Subtract": "GL_SUBTRACT"
}, },
"TextureEnvMode": "TextureEnvMode":
{ {
"Add" : "GL_ADD", "Add": "GL_ADD",
"Blend" : "GL_BLEND", "Blend": "GL_BLEND",
"Combine" : "GL_COMBINE", "Combine": "GL_COMBINE",
"Decal" : "GL_DECAL", "Decal": "GL_DECAL",
"Modulate" : "GL_MODULATE", "Modulate": "GL_MODULATE",
"Replace" : "GL_REPLACE" "Replace": "GL_REPLACE"
}, },
"TextureOp": "TextureOp":
{ {
"OneMinusSrcAlpha" : "GL_ONE_MINUS_SRC_ALPHA", "OneMinusSrcAlpha": "GL_ONE_MINUS_SRC_ALPHA",
"OneMinusSrcColor" : "GL_ONE_MINUS_SRC_COLOR", "OneMinusSrcColor": "GL_ONE_MINUS_SRC_COLOR",
"SrcAlpha" : "GL_SRC_ALPHA", "SrcAlpha": "GL_SRC_ALPHA",
"SrcColor" : "GL_SRC_COLOR" "SrcColor": "GL_SRC_COLOR"
}, },
"TextureSrc": "TextureSrc":
{ {
"Constant" : "GL_CONSTANT", "Constant": "GL_CONSTANT",
"Previous" : "GL_PREVIOUS", "Previous": "GL_PREVIOUS",
"PrimaryColor" : "GL_PRIMARY_COLOR", "PrimaryColor": "GL_PRIMARY_COLOR",
"Texture" : "GL_TEXTURE" "Texture": "GL_TEXTURE"
}, },
"TextureType": "TextureType":
{ {
...@@ -171,33 +171,33 @@ ...@@ -171,33 +171,33 @@
}, },
"VertexArrayType": "VertexArrayType":
{ {
"Color" : "GL_COLOR_ARRAY", "Color": "GL_COLOR_ARRAY",
"Normal" : "GL_NORMAL_ARRAY", "Normal": "GL_NORMAL_ARRAY",
"PointSize" : "GL_POINT_SIZE_ARRAY_OES", "PointSize": "GL_POINT_SIZE_ARRAY_OES",
"TextureCoord" : "GL_TEXTURE_COORD_ARRAY", "TextureCoord": "GL_TEXTURE_COORD_ARRAY",
"Vertex" : "GL_VERTEX_ARRAY" "Vertex": "GL_VERTEX_ARRAY"
}, },
"MaterialParameter": "MaterialParameter":
{ {
"Ambient" : "GL_AMBIENT", "Ambient": "GL_AMBIENT",
"AmbientAndDiffuse" : "GL_AMBIENT_AND_DIFFUSE", "AmbientAndDiffuse": "GL_AMBIENT_AND_DIFFUSE",
"Diffuse" : "GL_DIFFUSE", "Diffuse": "GL_DIFFUSE",
"Emission" : "GL_EMISSION", "Emission": "GL_EMISSION",
"Shininess" : "GL_SHININESS", "Shininess": "GL_SHININESS",
"Specular" : "GL_SPECULAR" "Specular": "GL_SPECULAR"
}, },
"LightParameter": "LightParameter":
{ {
"Ambient" : "GL_AMBIENT", "Ambient": "GL_AMBIENT",
"AmbientAndDiffuse" : "GL_AMBIENT_AND_DIFFUSE", "AmbientAndDiffuse": "GL_AMBIENT_AND_DIFFUSE",
"ConstantAttenuation" : "GL_CONSTANT_ATTENUATION", "ConstantAttenuation": "GL_CONSTANT_ATTENUATION",
"Diffuse" : "GL_DIFFUSE", "Diffuse": "GL_DIFFUSE",
"LinearAttenuation" : "GL_LINEAR_ATTENUATION", "LinearAttenuation": "GL_LINEAR_ATTENUATION",
"Position" : "GL_POSITION", "Position": "GL_POSITION",
"QuadraticAttenuation" : "GL_QUADRATIC_ATTENUATION", "QuadraticAttenuation": "GL_QUADRATIC_ATTENUATION",
"Specular" : "GL_SPECULAR", "Specular": "GL_SPECULAR",
"SpotCutoff" : "GL_SPOT_CUTOFF", "SpotCutoff": "GL_SPOT_CUTOFF",
"SpotDirection" : "GL_SPOT_DIRECTION", "SpotDirection": "GL_SPOT_DIRECTION",
"SpotExponent" : "GL_SPOT_EXPONENT" "SpotExponent": "GL_SPOT_EXPONENT"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment