resolve merge conflicts of cfeb3c0 to nyc-dev

[platform/upstream/VK-GL-CTS.git] / framework / platform / null / tcuNullRenderContext.cpp

diff --git a/framework/platform/null/tcuNullRenderContext.cpp b/framework/platform/null/tcuNullRenderContext.cpp
index b91d2ee..61b6640 100644 (file)
--- a/framework/platform/null/tcuNullRenderContext.cpp
+++ b/framework/platform/null/tcuNullRenderContext.cpp
@@ -361,7 +361,7 @@ GLW_APICALL void GLW_APIENTRY glGetIntegerv (GLenum pname, GLint* params)
                        break;
 
                case GL_COMPRESSED_TEXTURE_FORMATS:
-                       deMemcpy(params, &ctx->compressedTextureList[0], (int)ctx->compressedTextureList.size());
+                       deMemcpy(params, &ctx->compressedTextureList[0], ctx->compressedTextureList.size()*sizeof(deUint32));
                        break;
 
                case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS: