From: Alexander Galazin <alexander.galazin@arm.com>
Date: Thu, 26 Jul 2018 08:47:38 +0000 (+0200)
Subject: Merge vk-gl-cts/github-master into vk-gl-cts/master
X-Git-Tag: upstream/1.3.5~2567
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=401a4b78547be48ee91f4719564a3fd2e8231b92;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge vk-gl-cts/github-master into vk-gl-cts/master

Change-Id: I4a1a3f2e84c071dc18b3a8247fb0679d6c2d84e3
---

401a4b78547be48ee91f4719564a3fd2e8231b92
diff --cc external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp
index da01895,94b66b1..99a38e2
--- a/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp
+++ b/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp
@@@ -15462,18 -15462,20 +15462,20 @@@ bool BuiltinFunctionTest::isResultEdgeC
  	case FUNCTION_MOD:
  	case FUNCTION_MOD_AGAINST_SCALAR:
  	{
--		const glw::GLuint	arguments_stride  = function_object.getArgumentStride();
--		const glw::GLuint	vertex_offset	 = arguments_stride * vertex;
--		const glw::GLuint	argument_1_offset = function_object.getArgumentOffset(0);
--		const glw::GLuint	argument_2_offset = function_object.getArgumentOffset(1);
--		const glw::GLuint	argument_1_index  = argument_1_offset + vertex_offset;
--		const glw::GLuint	argument_2_index  = argument_2_offset + vertex_offset;
++		const glw::GLuint	arguments_stride   = function_object.getArgumentStride();
++		const glw::GLuint	vertex_offset	   = arguments_stride * vertex;
++		const glw::GLuint	argument_1_offset  = function_object.getArgumentOffset(0);
++		const glw::GLuint	argument_2_offset  = function_object.getArgumentOffset(1);
++		const glw::GLuint	argument_1_index   = argument_1_offset + vertex_offset;
++		const glw::GLuint	argument_2_index   = argument_2_offset + vertex_offset;
  		const glw::GLubyte*  argument_1_bytes  = &m_argument_data[argument_1_index];
  		const glw::GLubyte*  argument_2_bytes  = &m_argument_data[argument_2_index];
  		const glw::GLdouble* argument_1		   = reinterpret_cast<const glw::GLdouble*>(argument_1_bytes);
  		const glw::GLdouble* argument_2		   = reinterpret_cast<const glw::GLdouble*>(argument_2_bytes);
  		const glw::GLdouble* expected_result   = reinterpret_cast<const glw::GLdouble*>(expected_result_src);
 -		const glw::GLdouble* actual_result     = reinterpret_cast<const glw::GLdouble*>(result_src);
++		const glw::GLdouble* actual_result	   = reinterpret_cast<const glw::GLdouble*>(result_src);
  		bool				 edge_case_present = false;
 -		bool				 recheck 		   = false;
++		bool				 recheck		   = false;
  
  		// verify if there is a mod(a, a) case and prepare new expected result
  		const glw::GLuint		   n_components = Utils::getNumberOfComponentsForVariableType(result_type);