From: Jarkko Pöyry <jpoyry@google.com>
Date: Fri, 22 May 2015 04:01:24 +0000 (-0700)
Subject: Fix -Wconversion warnings in fragment output tests.
X-Git-Tag: upstream/0.1.0~1636^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29574d73328b3bfe764c0cbdb694244bee97e2e0;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix -Wconversion warnings in fragment output tests.

Bug: 21161908
Change-Id: I9c57fbcdecda3916e6ff33370dde0588c7a3e897
---

diff --git a/modules/gles3/functional/es3fFragDepthTests.cpp b/modules/gles3/functional/es3fFragDepthTests.cpp
index 5647765..d8d8dd8 100644
--- a/modules/gles3/functional/es3fFragDepthTests.cpp
+++ b/modules/gles3/functional/es3fFragDepthTests.cpp
@@ -235,7 +235,7 @@ FragDepthCompareCase::IterateResult FragDepthCompareCase::iterate (void)
 	// Render reference.
 	for (int y = 0; y < referenceFrame.getHeight(); y++)
 	{
-		float	yf		= ((float)y + 0.5f) / referenceFrame.getHeight();
+		float	yf		= ((float)y + 0.5f) / (float)referenceFrame.getHeight();
 		int		half	= de::clamp((int)((float)referenceFrame.getWidth()*0.5f + 0.5f), 0, referenceFrame.getWidth());
 
 		// Fill left half - comparison to constant 0.5
@@ -252,7 +252,7 @@ FragDepthCompareCase::IterateResult FragDepthCompareCase::iterate (void)
 		for (int x = half; x < referenceFrame.getWidth(); x++)
 		{
 			float	xf		= ((float)x + 0.5f) / (float)referenceFrame.getWidth();
-			float	xh		= ((float)x - half + 0.5f) / (float)(referenceFrame.getWidth()-half);
+			float	xh		= ((float)(x - half) + 0.5f) / (float)(referenceFrame.getWidth()-half);
 			float	rd		= 1.0f - (xh + yf) * 0.5f;
 			float	d		= m_evalFunc(Vec2(xf, yf));
 			bool	dpass	= compare(m_compareFunc, d, rd);
diff --git a/modules/gles3/functional/es3fFragmentOutputTests.cpp b/modules/gles3/functional/es3fFragmentOutputTests.cpp
index 1dc1415..53963cd 100644
--- a/modules/gles3/functional/es3fFragmentOutputTests.cpp
+++ b/modules/gles3/functional/es3fFragmentOutputTests.cpp
@@ -597,11 +597,11 @@ FragmentOutputCase::IterateResult FragmentOutputCase::iterate (void)
 		int	quadY	= quadNdx / (gridWidth-1);
 		int quadX	= quadNdx - quadY*(gridWidth-1);
 
-		indices[quadNdx*6+0] = quadX + quadY*gridWidth;
-		indices[quadNdx*6+1] = quadX + (quadY+1)*gridWidth;
-		indices[quadNdx*6+2] = quadX + quadY*gridWidth + 1;
+		indices[quadNdx*6+0] = deUint16(quadX + quadY*gridWidth);
+		indices[quadNdx*6+1] = deUint16(quadX + (quadY+1)*gridWidth);
+		indices[quadNdx*6+2] = deUint16(quadX + quadY*gridWidth + 1);
 		indices[quadNdx*6+3] = indices[quadNdx*6+1];
-		indices[quadNdx*6+4] = quadX + (quadY+1)*gridWidth + 1;
+		indices[quadNdx*6+4] = deUint16(quadX + (quadY+1)*gridWidth + 1);
 		indices[quadNdx*6+5] = indices[quadNdx*6+2];
 	}