add range check to service-side MapBufferRange

gpu/command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h"
 
 using ::gl::MockGLInterface;
@@ skipping 63 matching lines @@
   const GLsizeiptr kSize = 64;
   const GLbitfield kAccess = GL_MAP_READ_BIT;
 
   uint32_t result_shm_id = kSharedMemoryId;
   uint32_t result_shm_offset = kSharedMemoryOffset;
   uint32_t data_shm_id = kSharedMemoryId;
   // uint32_t is Result for both MapBufferRange and UnmapBuffer commands.
   uint32_t data_shm_offset = kSharedMemoryOffset + sizeof(uint32_t);
 
   DoBindBuffer(kTarget, client_buffer_id_, kServiceBufferId);
+  DoBufferData(kTarget, kSize + kOffset);
 
   std::vector<int8_t> data(kSize);
   for (GLsizeiptr ii = 0; ii < kSize; ++ii) {
     data[ii] = static_cast<int8_t>(ii % 255);
   }
 
   {  // MapBufferRange
     EXPECT_CALL(*gl_,
                 MapBufferRange(kTarget, kOffset, kSize, kAccess))
         .WillOnce(Return(&data[0]))
@@ skipping 40 matching lines @@
   const GLbitfield kAccess = GL_MAP_WRITE_BIT;
   const GLbitfield kMappedAccess = GL_MAP_WRITE_BIT | GL_MAP_READ_BIT;
 
   uint32_t result_shm_id = kSharedMemoryId;
   uint32_t result_shm_offset = kSharedMemoryOffset;
   uint32_t data_shm_id = kSharedMemoryId;
   // uint32_t is Result for both MapBufferRange and UnmapBuffer commands.
   uint32_t data_shm_offset = kSharedMemoryOffset + sizeof(uint32_t);
 
   DoBindBuffer(kTarget, client_buffer_id_, kServiceBufferId);
+  DoBufferData(kTarget, kSize + kOffset);
 
   std::vector<int8_t> data(kSize);
   for (GLsizeiptr ii = 0; ii < kSize; ++ii) {
     data[ii] = static_cast<int8_t>(ii % 255);
   }
 
   {  // MapBufferRange succeeds
     EXPECT_CALL(*gl_,
                 MapBufferRange(kTarget, kOffset, kSize, kMappedAccess))
         .WillOnce(Return(&data[0]))
@@ skipping 56 matching lines @@
 }
 
 TEST_P(GLES2DecoderTest, MapBufferRangeWriteInvalidateRangeSucceeds) {
   const GLenum kTarget = GL_ARRAY_BUFFER;
   const GLintptr kOffset = 10;
   const GLsizeiptr kSize = 64;
   // With MAP_INVALIDATE_RANGE_BIT, no need to append MAP_READ_BIT.
   const GLbitfield kAccess = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT;
 
   DoBindBuffer(kTarget, client_buffer_id_, kServiceBufferId);
+  DoBufferData(kTarget, kSize + kOffset);
 
   std::vector<int8_t> data(kSize);
   for (GLsizeiptr ii = 0; ii < kSize; ++ii) {
     data[ii] = static_cast<int8_t>(ii % 255);
   }
   EXPECT_CALL(*gl_,
               MapBufferRange(kTarget, kOffset, kSize, kAccess))
       .WillOnce(Return(&data[0]))
       .RetiresOnSaturation();
 
@@ skipping 19 matching lines @@
   // Test INVALIDATE_BUFFER_BIT is mapped to INVALIDATE_RANGE_BIT.
   const GLenum kTarget = GL_ARRAY_BUFFER;
   const GLintptr kOffset = 10;
   const GLsizeiptr kSize = 64;
   const GLbitfield kAccess = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT;
   // With MAP_INVALIDATE_BUFFER_BIT, no need to append MAP_READ_BIT.
   const GLbitfield kFilteredAccess =
       GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT;
 
   DoBindBuffer(kTarget, client_buffer_id_, kServiceBufferId);
+  DoBufferData(kTarget, kSize + kOffset);
 
   std::vector<int8_t> data(kSize);
   for (GLsizeiptr ii = 0; ii < kSize; ++ii) {
     data[ii] = static_cast<int8_t>(ii % 255);
   }
   EXPECT_CALL(*gl_,
               MapBufferRange(kTarget, kOffset, kSize, kFilteredAccess))
       .WillOnce(Return(&data[0]))
       .RetiresOnSaturation();
 
@@ skipping 17 matching lines @@
 
 TEST_P(GLES2DecoderTest, MapBufferRangeWriteUnsynchronizedBit) {
   // Test UNSYNCHRONIZED_BIT is filtered out.
   const GLenum kTarget = GL_ARRAY_BUFFER;
   const GLintptr kOffset = 10;
   const GLsizeiptr kSize = 64;
   const GLbitfield kAccess = GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT;
   const GLbitfield kFilteredAccess = GL_MAP_WRITE_BIT | GL_MAP_READ_BIT;
 
   DoBindBuffer(kTarget, client_buffer_id_, kServiceBufferId);
+  DoBufferData(kTarget, kSize + kOffset);
 
   std::vector<int8_t> data(kSize);
   for (GLsizeiptr ii = 0; ii < kSize; ++ii) {
     data[ii] = static_cast<int8_t>(ii % 255);
   }
   EXPECT_CALL(*gl_,
               MapBufferRange(kTarget, kOffset, kSize, kFilteredAccess))
       .WillOnce(Return(&data[0]))
       .RetiresOnSaturation();
 
@@ skipping 18 matching lines @@
 
 TEST_P(GLES2DecoderTest, MapBufferRangeWithError) {
   const GLenum kTarget = GL_ARRAY_BUFFER;
   const GLintptr kOffset = 10;
   const GLsizeiptr kSize = 64;
   const GLbitfield kAccess = GL_MAP_READ_BIT;
   std::vector<int8_t> data(kSize);
   for (GLsizeiptr ii = 0; ii < kSize; ++ii) {
     data[ii] = static_cast<int8_t>(ii % 255);
   }
-  EXPECT_CALL(*gl_,
-              MapBufferRange(kTarget, kOffset, kSize, kAccess))
-      .WillOnce(Return(nullptr))  // Return nullptr to indicate a GL error.
-      .RetiresOnSaturation();
 
   typedef MapBufferRange::Result Result;
   Result* result = GetSharedMemoryAs<Result*>();
   *result = 0;
   uint32_t result_shm_id = kSharedMemoryId;
   uint32_t result_shm_offset = kSharedMemoryOffset;
   uint32_t data_shm_id = kSharedMemoryId;
   uint32_t data_shm_offset = kSharedMemoryOffset + sizeof(*result);
 
   int8_t* mem = reinterpret_cast<int8_t*>(&result[1]);
   memset(mem, 72, kSize);  // Init to a random value other than 0.
 
   MapBufferRange cmd;
   cmd.Init(kTarget, kOffset, kSize, kAccess, data_shm_id, data_shm_offset,
            result_shm_id, result_shm_offset);
   decoder_->set_unsafe_es3_apis_enabled(true);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   memset(&data[0], 72, kSize);
   // Mem is untouched.
   EXPECT_EQ(0, memcmp(&data[0], mem, kSize));
   EXPECT_EQ(0u, *result);
+  EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 }
 
 TEST_P(GLES2DecoderTest, MapBufferRangeBadSharedMemoryFails) {
   const GLenum kTarget = GL_ARRAY_BUFFER;
   const GLintptr kOffset = 10;
   const GLsizeiptr kSize = 64;
   const GLbitfield kAccess = GL_MAP_READ_BIT;
   std::vector<int8_t> data(kSize);
   for (GLsizeiptr ii = 0; ii < kSize; ++ii) {
     data[ii] = static_cast<int8_t>(ii % 255);
@@ skipping 56 matching lines @@
   const GLbitfield kAccess = GL_MAP_WRITE_BIT;
   const GLbitfield kFilteredAccess = GL_MAP_WRITE_BIT | GL_MAP_READ_BIT;
 
   uint32_t result_shm_id = kSharedMemoryId;
   uint32_t result_shm_offset = kSharedMemoryOffset;
   uint32_t data_shm_id = kSharedMemoryId;
   // uint32_t is Result for both MapBufferRange and UnmapBuffer commands.
   uint32_t data_shm_offset = kSharedMemoryOffset + sizeof(uint32_t);
 
   DoBindBuffer(kTarget, client_buffer_id_, kServiceBufferId);
+  DoBufferData(kTarget, kSize + kOffset);
 
   std::vector<int8_t> data(kSize);
 
   decoder_->set_unsafe_es3_apis_enabled(true);
 
   {  // MapBufferRange succeeds
     EXPECT_CALL(*gl_,
                 MapBufferRange(kTarget, kOffset, kSize, kFilteredAccess))
         .WillOnce(Return(&data[0]))
         .RetiresOnSaturation();
@@ skipping 29 matching lines @@
   const GLbitfield kAccess = GL_MAP_WRITE_BIT;
   const GLbitfield kFilteredAccess = GL_MAP_WRITE_BIT | GL_MAP_READ_BIT;
 
   uint32_t result_shm_id = kSharedMemoryId;
   uint32_t result_shm_offset = kSharedMemoryOffset;
   uint32_t data_shm_id = kSharedMemoryId;
   // uint32_t is Result for both MapBufferRange and UnmapBuffer commands.
   uint32_t data_shm_offset = kSharedMemoryOffset + sizeof(uint32_t);
 
   DoBindBuffer(kTarget, client_buffer_id_, kServiceBufferId);
+  DoBufferData(kTarget, kSize + kOffset);
 
   std::vector<int8_t> data(kSize);
 
   decoder_->set_unsafe_es3_apis_enabled(true);
 
   {  // MapBufferRange succeeds
     EXPECT_CALL(*gl_,
                 MapBufferRange(kTarget, kOffset, kSize, kFilteredAccess))
         .WillOnce(Return(&data[0]))
         .RetiresOnSaturation();
@@ skipping 103 matching lines @@
     if (ii >= kWriteOffset && ii < kWriteOffset + kCopySize) {
       EXPECT_EQ(kValue0, shadow_data[ii]);
     } else {
       EXPECT_EQ(kValue1, shadow_data[ii]);
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu