From eeec8accefdba51359d238575ade720d02a90276 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Fri, 3 Apr 2015 12:32:17 -0700 Subject: [PATCH] Fix warnings caused by using unnamed enums as template parameters Change-Id: I30d54d7cdd987488d5362e6d5af1169f734e6d4e --- modules/gles31/functional/es31fTessellationTests.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/gles31/functional/es31fTessellationTests.cpp b/modules/gles31/functional/es31fTessellationTests.cpp index 4b7ceac..7c08f7d 100644 --- a/modules/gles31/functional/es31fTessellationTests.cpp +++ b/modules/gles31/functional/es31fTessellationTests.cpp @@ -5998,9 +5998,9 @@ void UserDefinedIOCase::init (void) DE_ASSERT(numElements != -2); if (isArray) - tcsDeclarations += outMaybePatch + output.declareArray(m_ioType == IO_TYPE_PER_PATCH_ARRAY ? de::toString(NUM_PER_PATCH_ARRAY_ELEMS) - : m_ioType == IO_TYPE_PER_PATCH_BLOCK_ARRAY ? de::toString(NUM_PER_PATCH_BLOCKS) - : isExplicitVertexArraySize ? de::toString(NUM_OUTPUT_VERTICES) + tcsDeclarations += outMaybePatch + output.declareArray(m_ioType == IO_TYPE_PER_PATCH_ARRAY ? de::toString(int(NUM_PER_PATCH_ARRAY_ELEMS)) + : m_ioType == IO_TYPE_PER_PATCH_BLOCK_ARRAY ? de::toString(int(NUM_PER_PATCH_BLOCKS)) + : isExplicitVertexArraySize ? de::toString(int(NUM_OUTPUT_VERTICES)) : ""); else tcsDeclarations += outMaybePatch + output.declare(); @@ -6015,7 +6015,7 @@ void UserDefinedIOCase::init (void) tcsStatements += output.glslTraverseBasicType(2, glslAssignBasicTypeObject); if (!isPerPatchIO) - tcsStatements += "\t\tv += float(" + de::toString(NUM_OUTPUT_VERTICES) + "-gl_InvocationID-1)*" + de::floatToString(0.4f*output.numBasicSubobjectsInElementType(), 1) + ";\n"; + tcsStatements += "\t\tv += float(" + de::toString(int(NUM_OUTPUT_VERTICES)) + "-gl_InvocationID-1)*" + de::floatToString(0.4f*output.numBasicSubobjectsInElementType(), 1) + ";\n"; } tcsStatements += "\t}\n"; @@ -6040,8 +6040,8 @@ void UserDefinedIOCase::init (void) DE_ASSERT(numElements != -2); if (isArray) - tesDeclarations += inMaybePatch + input.declareArray(m_ioType == IO_TYPE_PER_PATCH_ARRAY ? de::toString(NUM_PER_PATCH_ARRAY_ELEMS) - : m_ioType == IO_TYPE_PER_PATCH_BLOCK_ARRAY ? de::toString(NUM_PER_PATCH_BLOCKS) + tesDeclarations += inMaybePatch + input.declareArray(m_ioType == IO_TYPE_PER_PATCH_ARRAY ? de::toString(int(NUM_PER_PATCH_ARRAY_ELEMS)) + : m_ioType == IO_TYPE_PER_PATCH_BLOCK_ARRAY ? de::toString(int(NUM_PER_PATCH_BLOCKS)) : isExplicitVertexArraySize ? de::toString(vertexAttrArrayInputSize) : ""); else @@ -6070,7 +6070,7 @@ void UserDefinedIOCase::init (void) << glu::TessellationControlSource ("#version 310 es\n" "#extension GL_EXT_tessellation_shader : require\n" "\n" - "layout (vertices = " + de::toString(NUM_OUTPUT_VERTICES) + ") out;\n" + "layout (vertices = " + de::toString(int(NUM_OUTPUT_VERTICES)) + ") out;\n" "\n" + tcsDeclarations + "\n" -- 2.7.4