diff options
Diffstat (limited to 'modules/gles31/functional/es31fNegativeStateApiTests.cpp')
| -rw-r--r-- | modules/gles31/functional/es31fNegativeStateApiTests.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/gles31/functional/es31fNegativeStateApiTests.cpp b/modules/gles31/functional/es31fNegativeStateApiTests.cpp index 284bf4561..2ca77fd18 100644 --- a/modules/gles31/functional/es31fNegativeStateApiTests.cpp +++ b/modules/gles31/functional/es31fNegativeStateApiTests.cpp @@ -850,8 +850,8 @@ void get_active_uniformsiv (NegativeTestContext& ctx) { GLuint shader = ctx.glCreateShader(GL_VERTEX_SHADER); glu::ShaderProgram program (ctx.getRenderContext(), glu::makeVtxFragSources(getVtxFragVersionSources(uniformTestVertSource, ctx), getVtxFragVersionSources(uniformTestFragSource, ctx))); - GLuint dummyUniformIndex = 1; - GLint dummyParamDst = -1; + GLuint unusedUniformIndex = 1; + GLint unusedParamDst = -1; GLint numActiveUniforms = -1; ctx.glUseProgram(program.getProgram()); @@ -860,12 +860,12 @@ void get_active_uniformsiv (NegativeTestContext& ctx) ctx.getLog() << TestLog::Message << "// GL_ACTIVE_UNIFORMS = " << numActiveUniforms << " (expected 4)." << TestLog::EndMessage; ctx.beginSection("GL_INVALID_VALUE is generated if program is not a value generated by OpenGL."); - ctx.glGetActiveUniformsiv(-1, 1, &dummyUniformIndex, GL_UNIFORM_TYPE, &dummyParamDst); + ctx.glGetActiveUniformsiv(-1, 1, &unusedUniformIndex, GL_UNIFORM_TYPE, &unusedParamDst); ctx.expectError(GL_INVALID_VALUE); ctx.endSection(); ctx.beginSection("GL_INVALID_OPERATION is generated if program is not a program object."); - ctx.glGetActiveUniformsiv(shader, 1, &dummyUniformIndex, GL_UNIFORM_TYPE, &dummyParamDst); + ctx.glGetActiveUniformsiv(shader, 1, &unusedUniformIndex, GL_UNIFORM_TYPE, &unusedParamDst); ctx.expectError(GL_INVALID_OPERATION); ctx.endSection(); @@ -877,14 +877,14 @@ void get_active_uniformsiv (NegativeTestContext& ctx) invalidUniformIndices.push_back(numActiveUniforms-1+excess); invalidUniformIndices.push_back(1); - std::vector<GLint> dummyParamsDst(invalidUniformIndices.size()); - ctx.glGetActiveUniformsiv(program.getProgram(), (GLsizei)invalidUniformIndices.size(), &invalidUniformIndices[0], GL_UNIFORM_TYPE, &dummyParamsDst[0]); + std::vector<GLint> unusedParamsDst(invalidUniformIndices.size()); + ctx.glGetActiveUniformsiv(program.getProgram(), (GLsizei)invalidUniformIndices.size(), &invalidUniformIndices[0], GL_UNIFORM_TYPE, &unusedParamsDst[0]); ctx.expectError(excess == 0 ? GL_NO_ERROR : GL_INVALID_VALUE); } ctx.endSection(); ctx.beginSection("GL_INVALID_ENUM is generated if pname is not an accepted token."); - ctx.glGetActiveUniformsiv(program.getProgram(), 1, &dummyUniformIndex, -1, &dummyParamDst); + ctx.glGetActiveUniformsiv(program.getProgram(), 1, &unusedUniformIndex, -1, &unusedParamDst); ctx.expectError(GL_INVALID_ENUM); ctx.endSection(); |