From f75a5cccd800bb011b44c799415efdfe547d6076 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Tue, 2 Oct 2018 11:51:25 -0600 Subject: [PATCH] Use non-arrayed varying name for TCS blocks This is a partial revert of CL 2625 to restore naming the value member of the BLOCK_INOUT interface block as "BLOCK_INOUT.value" rather than "BLOCK_INOUT[0].value". Affects: KHR-GL46.tessellation_shader.single.xfb_captures_data_from_correct_stage Components: OpenGL VK-GL-CTS issue: 1388 Change-Id: I9ef6453ec5465a0fa5561220cc9d7bfe54298416 --- .../tessellation_shader/esextcTessellationShaderXFB.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderXFB.cpp b/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderXFB.cpp index cbc162331b..c006758fdd 100644 --- a/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderXFB.cpp +++ b/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderXFB.cpp @@ -297,7 +297,6 @@ void TessellationShaderXFB::initTest() /* Create a fragment shader program */ glw::GLint link_status = GL_FALSE; const glw::GLchar* varying_name = "BLOCK_INOUT.value"; - const glw::GLchar* varying_array_name = "BLOCK_INOUT[0].value"; m_fs_program_id = createSeparableProgram(GL_FRAGMENT_SHADER, 1, /* n_strings */ &fs_body, 0, /* n_varyings */ @@ -404,7 +403,7 @@ void TessellationShaderXFB::initTest() /* Create a tessellation control shader program */ m_tc_program_id = createSeparableProgram(m_glExtTokens.TESS_CONTROL_SHADER, 1, /* n_strings */ &tc_body, 1, /* n_varyings */ - &varying_array_name, /* varyings */ + &varying_name, /* varyings */ tc_feedback_valid); /* should_succeed */ if (!tc_feedback_valid)