Skip to content

Commit

Permalink
Use non-arrayed varying name for TCS blocks
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pdaniell-nv authored and alegal-arm committed Oct 11, 2018
1 parent e722dfa commit f75a5cc
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit f75a5cc

Please sign in to comment.