Skip to content

Commit

Permalink
Reland 101545 - Moved code not relating to GPU scheduling out of GpuS…
Browse files Browse the repository at this point in the history
…cheduler and into GpuCommandBufferStub.

Reason for revert: Compile failure on Arm.

This was mostly a refactor because the code was awkward.

I also deleted the original gles2_demo since we have the gles2 book demos now.

THings still to do are a common way of setting up the few objects involved in initializing a command buffer that is now more-or-less duplicated in the gles2 conformance tests, the gles2 demos, the command buffer stub and the in-process webgl context. I also want to completely remove the reference to the decoder from the scheduler.

I tested WebGL on both windows and mac and saw no regressions. I checked the conformance tests, the gpu tests and am running by the try bots now. The gles2 demos still work.
Review URL: http://codereview.chromium.org/7782041
Review URL: http://codereview.chromium.org/7951008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101873 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
apatrick@chromium.org committed Sep 20, 2011
1 parent db02135 commit 79311e8
Show file tree
Hide file tree
Showing 30 changed files with 472 additions and 1,547 deletions.
2 changes: 1 addition & 1 deletion content/common/gpu/gpu_channel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ void GpuChannel::OnCreateTransportTexture(int32 context_route_id,
int32 route_id = GenerateRouteID();

scoped_ptr<TransportTexture> transport(
new TransportTexture(this, channel_.get(), stub->scheduler()->decoder(),
new TransportTexture(this, channel_.get(), stub->decoder(),
host_id, route_id));
router_.AddRoute(route_id, transport.get());
transport_textures_.AddWithID(transport.release(), route_id);
Expand Down
Loading

0 comments on commit 79311e8

Please sign in to comment.