Revert of command_buffer: Implement EXT_multisample_compatibility (patchset #9 id:160001 of https://codereview.chromium.org/1231673006/ )

Reason for revert:
Breaking the EXTMultisampleCompatibilityTest.DrawAndResolve test on AMD.

EXTMultisampleCompatibilityTest.DrawAndResolve:
../../gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc:208: Failure
Value of: r
Actual: '\x80' (128)
Expected: 255u
Which is: 255
../../gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc:209: Failure
Value of: g
Actual: '\x80' (128)
Expected: 0u
Which is: 0
../../gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc:225: Failure
Value of: r
Actual: '\x80' (128)
Expected: 255u
Which is: 255
../../gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc:227: Failure
Value of: b
Actual: '\x80' (128)
Expected: 0u
Which is: 0

Original issue's description:
> command_buffer: Implement EXT_multisample_compatibility
>
> Implement EXT_multisample_compatibility OpenGL ES extension in command
> buffer.
>
> Skia needs this in order to enable and disable multisampling when
> using GL path rendering.
>
> BUG=506765
>
> Committed: https://crrev.com/e3237bbb682e52f92d5bd18dcab672677e4e3bc4
> Cr-Commit-Position: refs/heads/master@{#346847}
>
> Committed: https://crrev.com/28e57fb8caf8c0daf4be0692777aa9229cfdaa8b
> Cr-Commit-Position: refs/heads/master@{#347390}

TBR=vmiura@chromium.org,piman@chromium.org,zmo@google.com,markkilgard@gmail.com,zmo@chromium.org,sievers@google.com,kkinnunen@nvidia.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=506765, 529315

Review URL: https://codereview.chromium.org/1333493004

Cr-Commit-Position: refs/heads/master@{#347705}

1 files changed, 7 insertions, 34 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index ee79d97..370156e 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -84,10 +84,6 @@ _CAPABILITY_FLAGS = [
    'state_flag': 'framebuffer_state_.clear_state_dirty'},
   {'name': 'rasterizer_discard', 'es3': True},
   {'name': 'primitive_restart_fixed_index', 'es3': True},
-  {'name': 'multisample_ext', 'default': True,
-   'extension_flag': 'ext_multisample_compatibility'},
-  {'name': 'sample_alpha_to_one_ext',
-   'extension_flag': 'ext_multisample_compatibility'},
 ]
 
 _STATES = {
@@ -1091,11 +1087,9 @@ _NAMED_TYPE_INFO = {
   'Capability': {
     'type': 'GLenum',
     'valid': ["GL_%s" % cap['name'].upper() for cap in _CAPABILITY_FLAGS
-        if ('es3' not in cap or cap['es3'] != True)
-              and 'extension_flag' not in cap],
+        if 'es3' not in cap or cap['es3'] != True],
     'valid_es3': ["GL_%s" % cap['name'].upper() for cap in _CAPABILITY_FLAGS
-        if ('es3' in cap and cap['es3'] == True)
-              and 'extension_flag' not in cap],
+        if 'es3' in cap and cap['es3'] == True],
     'invalid': [
       'GL_CLIP_PLANE0',
       'GL_POINT_SPRITE',
@@ -9898,8 +9892,6 @@ class GLGenerator(object):
       f.write("struct EnableFlags {\n")
       f.write("  EnableFlags();\n")
       for capability in _CAPABILITY_FLAGS:
-        if 'extension_flag' in capability:
-          continue
         f.write("  bool %s;\n" % capability['name'])
       f.write("};\n\n")
     self.generated_cpp_filenames.append(filename)
@@ -10005,9 +9997,6 @@ void ContextState::InitCapabilities(const ContextState* prev_state) const {
           capability_es3 = 'es3' in capability and capability['es3'] == True
           if capability_es3 and not es3_caps or not capability_es3 and es3_caps:
             continue
-          if 'extension_flag' in capability:
-            f.write("  if (feature_info_->feature_flags().%s) {\n  " %
-                       capability['extension_flag'])
           if test_prev:
             f.write("""  if (prev_state->enable_flags.cached_%s !=
                                 enable_flags.cached_%s) {\n""" %
@@ -10016,8 +10005,6 @@ void ContextState::InitCapabilities(const ContextState* prev_state) const {
                      (capability_name.upper(), capability_name))
           if test_prev:
             f.write("  }")
-          if 'extension_flag' in capability:
-            f.write("  }")
 
       f.write("  if (prev_state) {")
       WriteCapabilities(True, False)
@@ -10143,8 +10130,6 @@ void ContextState::InitState(const ContextState *prev_state) const {
     with CHeaderWriter(filename, comment) as f:
       code = []
       for capability in _CAPABILITY_FLAGS:
-        if 'extension_flag' in capability:
-          continue
         code.append("%s(%s)" %
                     (capability['name'],
                      ('false', 'true')['default' in capability]))
@@ -10160,8 +10145,6 @@ bool ClientContextState::SetCapabilityState(
   switch (cap) {
 """)
       for capability in _CAPABILITY_FLAGS:
-        if 'extension_flag' in capability:
-          continue
         f.write("    case GL_%s:\n" % capability['name'].upper())
         f.write("""      if (enable_flags.%(name)s != enabled) {
          *changed = true;
@@ -10179,8 +10162,6 @@ bool ClientContextState::SetCapabilityState(
   switch (cap) {
 """)
       for capability in _CAPABILITY_FLAGS:
-        if 'extension_flag' in capability:
-          continue
         f.write("    case GL_%s:\n" % capability['name'].upper())
         f.write("      *enabled = enable_flags.%s;\n" % capability['name'])
         f.write("      return true;\n")
@@ -10278,17 +10259,11 @@ bool GLES2DecoderImpl::SetCapabilityState(GLenum cap, bool enabled) {
       bool es3_capable) {""")
       for capability in _CAPABILITY_FLAGS:
         capability_es3 = 'es3' in capability and capability['es3'] == True
-        if capability_es3:
-          continue
-        if 'extension_flag' in capability:
-          f.write("  if (group_->feature_info()->feature_flags().%s) {\n" %
-                   capability['extension_flag'])
-          f.write("  ")
-        f.write("  ExpectEnableDisable(GL_%s, %s);\n" %
-                (capability['name'].upper(),
-                 ('false', 'true')['default' in capability]))
-        if 'extension_flag' in capability:
-          f.write("  }")
+        if not capability_es3:
+          f.write("  ExpectEnableDisable(GL_%s, %s);\n" %
+                     (capability['name'].upper(),
+                      ('false', 'true')['default' in capability]))
+
       f.write("  if (es3_capable) {")
       for capability in _CAPABILITY_FLAGS:
         capability_es3 = 'es3' in capability and capability['es3'] == True
@@ -10934,8 +10909,6 @@ def main(argv):
         if not item['enum'] in gl_state_valid:
           gl_state_valid.append(item['enum'])
   for capability in _CAPABILITY_FLAGS:
-    if 'extension_flag' in capability:
-      continue
     valid_value = "GL_%s" % capability['name'].upper()
     if not valid_value in gl_state_valid:
       gl_state_valid.append(valid_value)