gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc - Issue 289993002: Remove shm versions of immediate commands from command buffer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 289993002: Remove shm versions of immediate commands from command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@functions-with-extension-flag

Patch Set: try to avoid compiler warning on buffer overflow and template specialization linker problem with tw… Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

index ec98832aae5096f254a3abe8fa156061b9c75933..38089b6a7db7ba49eac52adf499f216faae6059e 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

@@ -645,10 +645,7 @@ void GLES2DecoderTestBase::DoDeleteBuffer(

EXPECT_CALL(*gl_, DeleteBuffersARB(1, Pointee(service_id)))

.Times(1)

.RetiresOnSaturation();

- cmds::DeleteBuffers cmd;

- cmd.Init(1, shared_memory_id_, shared_memory_offset_);

- memcpy(shared_memory_address_, &client_id, sizeof(client_id));

- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

+ GenHelper<cmds::DeleteBuffersImmediate>(client_id);

}

void GLES2DecoderTestBase::SetupExpectationsForColorMask(bool red,

@@ -840,10 +837,7 @@ void GLES2DecoderTestBase::DoDeleteFramebuffer(

EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, Pointee(service_id)))

.Times(1)

.RetiresOnSaturation();

- cmds::DeleteFramebuffers cmd;

- cmd.Init(1, shared_memory_id_, shared_memory_offset_);

- memcpy(shared_memory_address_, &client_id, sizeof(client_id));

- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

+ GenHelper<cmds::DeleteFramebuffersImmediate>(client_id);

}

void GLES2DecoderTestBase::DoBindRenderbuffer(

@@ -866,10 +860,7 @@ void GLES2DecoderTestBase::DoDeleteRenderbuffer(

EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, Pointee(service_id)))

.Times(1)

.RetiresOnSaturation();

- cmds::DeleteRenderbuffers cmd;

- cmd.Init(1, shared_memory_id_, shared_memory_offset_);

- memcpy(shared_memory_address_, &client_id, sizeof(client_id));

- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

+ GenHelper<cmds::DeleteRenderbuffersImmediate>(client_id);

}

void GLES2DecoderTestBase::DoBindTexture(

@@ -891,10 +882,7 @@ void GLES2DecoderTestBase::DoDeleteTexture(

EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(service_id)))

.Times(1)

.RetiresOnSaturation();

- cmds::DeleteTextures cmd;

- cmd.Init(1, shared_memory_id_, shared_memory_offset_);

- memcpy(shared_memory_address_, &client_id, sizeof(client_id));

- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

+ GenHelper<cmds::DeleteTexturesImmediate>(client_id);

}

void GLES2DecoderTestBase::DoTexImage2D(