Commit 8fcf3c87 authored by Olli Etuaho's avatar Olli Etuaho Committed by Commit Bot

Add missing multiview extension check

The extension flag needs to be checked when multiview functions
are called on the GPU command buffer service side.

BUG=870240

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I372593c510154ab96fc7e2415c534a1fc46286e2
Reviewed-on: https://chromium-review.googlesource.com/1161901
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581066}
parent 885f074b
...@@ -4102,6 +4102,7 @@ _FUNCTION_INFO = { ...@@ -4102,6 +4102,7 @@ _FUNCTION_INFO = {
'decoder_func': 'DoFramebufferTextureMultiviewLayeredANGLE', 'decoder_func': 'DoFramebufferTextureMultiviewLayeredANGLE',
'unit_test': False, 'unit_test': False,
'extension': 'ANGLE_multiview', 'extension': 'ANGLE_multiview',
'extension_flag': 'angle_multiview',
'trace_level': 1, 'trace_level': 1,
'es3': True 'es3': True
}, },
......
...@@ -5349,6 +5349,10 @@ error::Error GLES2DecoderImpl::HandleFramebufferTextureMultiviewLayeredANGLE( ...@@ -5349,6 +5349,10 @@ error::Error GLES2DecoderImpl::HandleFramebufferTextureMultiviewLayeredANGLE(
*static_cast< *static_cast<
const volatile gles2::cmds::FramebufferTextureMultiviewLayeredANGLE*>( const volatile gles2::cmds::FramebufferTextureMultiviewLayeredANGLE*>(
cmd_data); cmd_data);
if (!features().angle_multiview) {
return error::kUnknownCommand;
}
GLenum target = static_cast<GLenum>(c.target); GLenum target = static_cast<GLenum>(c.target);
GLenum attachment = static_cast<GLenum>(c.attachment); GLenum attachment = static_cast<GLenum>(c.attachment);
GLuint texture = static_cast<GLuint>(c.texture); GLuint texture = static_cast<GLuint>(c.texture);
......
...@@ -4728,6 +4728,10 @@ GLES2DecoderPassthroughImpl::HandleFramebufferTextureMultiviewLayeredANGLE( ...@@ -4728,6 +4728,10 @@ GLES2DecoderPassthroughImpl::HandleFramebufferTextureMultiviewLayeredANGLE(
*static_cast< *static_cast<
const volatile gles2::cmds::FramebufferTextureMultiviewLayeredANGLE*>( const volatile gles2::cmds::FramebufferTextureMultiviewLayeredANGLE*>(
cmd_data); cmd_data);
if (!features().angle_multiview) {
return error::kUnknownCommand;
}
GLenum target = static_cast<GLenum>(c.target); GLenum target = static_cast<GLenum>(c.target);
GLenum attachment = static_cast<GLenum>(c.attachment); GLenum attachment = static_cast<GLenum>(c.attachment);
GLuint texture = static_cast<GLuint>(c.texture); GLuint texture = static_cast<GLuint>(c.texture);
......
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