| Index: gpu/command_buffer/common/gles2_cmd_utils.cc
|
| diff --git a/gpu/command_buffer/common/gles2_cmd_utils.cc b/gpu/command_buffer/common/gles2_cmd_utils.cc
|
| index be454295585884432fdb9c68cf178b17d0151d96..7a33ab1e48f9364ba885b3bbb595d76609c94c1b 100644
|
| --- a/gpu/command_buffer/common/gles2_cmd_utils.cc
|
| +++ b/gpu/command_buffer/common/gles2_cmd_utils.cc
|
| @@ -1082,7 +1082,7 @@ const int32 kBufferDestroyed = 0x3095; // EGL_BUFFER_DESTROYED
|
| const int32 kBindGeneratesResource = 0x10000;
|
| const int32 kFailIfMajorPerfCaveat = 0x10001;
|
| const int32 kLoseContextWhenOutOfMemory = 0x10002;
|
| -const int32 kES3ContextRequired = 0x10003;
|
| +const int32 kWebGLVersion = 0x10003;
|
|
|
| } // namespace
|
|
|
| @@ -1099,7 +1099,8 @@ ContextCreationAttribHelper::ContextCreationAttribHelper()
|
| bind_generates_resource(true),
|
| fail_if_major_perf_caveat(false),
|
| lose_context_when_out_of_memory(false),
|
| - es3_context_required(false) {}
|
| + webgl_version(0) {
|
| +}
|
|
|
| void ContextCreationAttribHelper::Serialize(std::vector<int32>* attribs) const {
|
| if (alpha_size != -1) {
|
| @@ -1142,8 +1143,8 @@ void ContextCreationAttribHelper::Serialize(std::vector<int32>* attribs) const {
|
| attribs->push_back(fail_if_major_perf_caveat ? 1 : 0);
|
| attribs->push_back(kLoseContextWhenOutOfMemory);
|
| attribs->push_back(lose_context_when_out_of_memory ? 1 : 0);
|
| - attribs->push_back(kES3ContextRequired);
|
| - attribs->push_back(es3_context_required ? 1 : 0);
|
| + attribs->push_back(kWebGLVersion);
|
| + attribs->push_back(webgl_version);
|
| attribs->push_back(kNone);
|
| }
|
|
|
| @@ -1198,8 +1199,8 @@ bool ContextCreationAttribHelper::Parse(const std::vector<int32>& attribs) {
|
| case kLoseContextWhenOutOfMemory:
|
| lose_context_when_out_of_memory = value != 0;
|
| break;
|
| - case kES3ContextRequired:
|
| - es3_context_required = value != 0;
|
| + case kWebGLVersion:
|
| + webgl_version = value;
|
| break;
|
| case kNone:
|
| // Terminate list, even if more attributes.
|
|
|