Command buffers: ensure we only read immediate data once

gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc

 // Copyright 2014 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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 2068 matching lines @@
 
   ClearBufferivImmediate& cmd =
       *GetImmediateAs<ClearBufferivImmediate>();
   GLint temp[4] = { 0 };
   cmd.Init(GL_COLOR, 0, &temp[0]);
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_DRAW_FRAMEBUFFER))
       .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
       .RetiresOnSaturation();
   SetupExpectationsForApplyingDirtyState(
       false, false, false, 0x1111, false, false, 0, 0, false);
-  EXPECT_CALL(*gl_, ClearBufferiv(
-                        GL_COLOR, 0,
-                        reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
+  EXPECT_CALL(*gl_, ClearBufferiv(GL_COLOR, 0, PointsToArray(temp, 4)));
   EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_P(GLES3DecoderTest, ClearBufferuivImmediateValidArgs) {
   DoBindFramebuffer(
       GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
   DoBindRenderbuffer(
       GL_RENDERBUFFER, client_renderbuffer_id_, kServiceRenderbufferId);
   DoRenderbufferStorage(
@@ skipping 11 matching lines @@
 
   ClearBufferuivImmediate& cmd =
       *GetImmediateAs<ClearBufferuivImmediate>();
   GLuint temp[4] = { 0u };
   cmd.Init(GL_COLOR, 0, &temp[0]);
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_DRAW_FRAMEBUFFER))
       .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
       .RetiresOnSaturation();
   SetupExpectationsForApplyingDirtyState(
       false, false, false, 0x1111, false, false, 0, 0, false);
-  EXPECT_CALL(*gl_, ClearBufferuiv(
-                        GL_COLOR, 0,
-                        reinterpret_cast<GLuint*>(
-                            ImmediateDataAddress(&cmd))));
+  EXPECT_CALL(*gl_, ClearBufferuiv(GL_COLOR, 0, PointsToArray(temp, 4)));
   EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_P(GLES3DecoderTest, ClearBufferfvImmediateValidArgs) {
   DoBindFramebuffer(
       GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
   DoBindRenderbuffer(
       GL_RENDERBUFFER, client_renderbuffer_id_, kServiceRenderbufferId);
   DoRenderbufferStorage(
@@ skipping 17 matching lines @@
 
   ClearBufferfvImmediate& cmd =
       *GetImmediateAs<ClearBufferfvImmediate>();
   GLfloat temp[4] = { 1.0f };
   cmd.Init(GL_DEPTH, 0, &temp[0]);
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_DRAW_FRAMEBUFFER))
       .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
       .RetiresOnSaturation();
   SetupExpectationsForApplyingDirtyState(
       true, true, false, 0x1110, true, true, 0, 0, false);
-  EXPECT_CALL(*gl_, ClearBufferfv(
-                        GL_DEPTH, 0,
-                        reinterpret_cast<GLfloat*>(
-                            ImmediateDataAddress(&cmd))));
+  EXPECT_CALL(*gl_, ClearBufferfv(GL_DEPTH, 0, PointsToArray(temp, 4)));
   EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_P(GLES3DecoderTest, ClearBufferfiValidArgs) {
   DoBindFramebuffer(
       GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
   DoBindRenderbuffer(
       GL_RENDERBUFFER, client_renderbuffer_id_, kServiceRenderbufferId);
   DoRenderbufferStorage(
@@ skipping 1454 matching lines @@
   EXPECT_TRUE(framebuffer->HasUnclearedAttachment(
       GL_DEPTH_STENCIL_ATTACHMENT));
 }
 
 // TODO(gman): PixelStorei
 
 // TODO(gman): SwapBuffers
 
 }  // namespace gles2
 }  // namespace gpu