diff options
author | jmadill <jmadill@chromium.org> | 2015-09-08 08:21:21 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-08 15:21:51 +0000 |
commit | cf517079e421da306379c6c05a99705e66ec3240 (patch) | |
tree | 1cfa9fd9f89efb0385dc675d26aaac441038612a /gpu/command_buffer/service/context_state_impl_autogen.h | |
parent | 6bbc8ce24e1f6a3e6060cd22442ffaf9b124d973 (diff) | |
download | chromium_src-cf517079e421da306379c6c05a99705e66ec3240.zip chromium_src-cf517079e421da306379c6c05a99705e66ec3240.tar.gz chromium_src-cf517079e421da306379c6c05a99705e66ec3240.tar.bz2 |
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}
Diffstat (limited to 'gpu/command_buffer/service/context_state_impl_autogen.h')
-rw-r--r-- | gpu/command_buffer/service/context_state_impl_autogen.h | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/gpu/command_buffer/service/context_state_impl_autogen.h b/gpu/command_buffer/service/context_state_impl_autogen.h index ce9f70f..450f0e2 100644 --- a/gpu/command_buffer/service/context_state_impl_autogen.h +++ b/gpu/command_buffer/service/context_state_impl_autogen.h @@ -34,11 +34,7 @@ ContextState::EnableFlags::EnableFlags() rasterizer_discard(false), cached_rasterizer_discard(false), primitive_restart_fixed_index(false), - cached_primitive_restart_fixed_index(false), - multisample_ext(true), - cached_multisample_ext(true), - sample_alpha_to_one_ext(false), - cached_sample_alpha_to_one_ext(false) {} + cached_primitive_restart_fixed_index(false) {} void ContextState::Initialize() { blend_color_red = 0.0f; @@ -180,19 +176,6 @@ void ContextState::InitCapabilities(const ContextState* prev_state) const { enable_flags.cached_stencil_test) { EnableDisable(GL_STENCIL_TEST, enable_flags.cached_stencil_test); } - if (feature_info_->feature_flags().ext_multisample_compatibility) { - if (prev_state->enable_flags.cached_multisample_ext != - enable_flags.cached_multisample_ext) { - EnableDisable(GL_MULTISAMPLE_EXT, enable_flags.cached_multisample_ext); - } - } - if (feature_info_->feature_flags().ext_multisample_compatibility) { - if (prev_state->enable_flags.cached_sample_alpha_to_one_ext != - enable_flags.cached_sample_alpha_to_one_ext) { - EnableDisable(GL_SAMPLE_ALPHA_TO_ONE_EXT, - enable_flags.cached_sample_alpha_to_one_ext); - } - } if (feature_info_->IsES3Capable()) { if (prev_state->enable_flags.cached_rasterizer_discard != enable_flags.cached_rasterizer_discard) { @@ -217,13 +200,6 @@ void ContextState::InitCapabilities(const ContextState* prev_state) const { EnableDisable(GL_SAMPLE_COVERAGE, enable_flags.cached_sample_coverage); EnableDisable(GL_SCISSOR_TEST, enable_flags.cached_scissor_test); EnableDisable(GL_STENCIL_TEST, enable_flags.cached_stencil_test); - if (feature_info_->feature_flags().ext_multisample_compatibility) { - EnableDisable(GL_MULTISAMPLE_EXT, enable_flags.cached_multisample_ext); - } - if (feature_info_->feature_flags().ext_multisample_compatibility) { - EnableDisable(GL_SAMPLE_ALPHA_TO_ONE_EXT, - enable_flags.cached_sample_alpha_to_one_ext); - } if (feature_info_->IsES3Capable()) { EnableDisable(GL_RASTERIZER_DISCARD, enable_flags.cached_rasterizer_discard); @@ -432,10 +408,6 @@ bool ContextState::GetEnabled(GLenum cap) const { return enable_flags.rasterizer_discard; case GL_PRIMITIVE_RESTART_FIXED_INDEX: return enable_flags.primitive_restart_fixed_index; - case GL_MULTISAMPLE_EXT: - return enable_flags.multisample_ext; - case GL_SAMPLE_ALPHA_TO_ONE_EXT: - return enable_flags.sample_alpha_to_one_ext; default: NOTREACHED(); return false; @@ -809,18 +781,6 @@ bool ContextState::GetStateAsGLint(GLenum pname, static_cast<GLint>(enable_flags.primitive_restart_fixed_index); } return true; - case GL_MULTISAMPLE_EXT: - *num_written = 1; - if (params) { - params[0] = static_cast<GLint>(enable_flags.multisample_ext); - } - return true; - case GL_SAMPLE_ALPHA_TO_ONE_EXT: - *num_written = 1; - if (params) { - params[0] = static_cast<GLint>(enable_flags.sample_alpha_to_one_ext); - } - return true; default: return false; } @@ -1189,18 +1149,6 @@ bool ContextState::GetStateAsGLfloat(GLenum pname, static_cast<GLfloat>(enable_flags.primitive_restart_fixed_index); } return true; - case GL_MULTISAMPLE_EXT: - *num_written = 1; - if (params) { - params[0] = static_cast<GLfloat>(enable_flags.multisample_ext); - } - return true; - case GL_SAMPLE_ALPHA_TO_ONE_EXT: - *num_written = 1; - if (params) { - params[0] = static_cast<GLfloat>(enable_flags.sample_alpha_to_one_ext); - } - return true; default: return false; } |