Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 333203003: Change GLInternalFormat param from GLint to GLenum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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 unified diff | Download patch
« no previous file with comments | « gpu/command_buffer/cmd_buffer_functions.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 10607 matching lines...) Expand 10 before | Expand all | Expand 10 after
10618 base::Unretained(GetAsyncPixelTransferManager()), 10618 base::Unretained(GetAsyncPixelTransferManager()),
10619 mem_params, 10619 mem_params,
10620 observer); 10620 observer);
10621 } 10621 }
10622 10622
10623 error::Error GLES2DecoderImpl::HandleAsyncTexImage2DCHROMIUM( 10623 error::Error GLES2DecoderImpl::HandleAsyncTexImage2DCHROMIUM(
10624 uint32 immediate_data_size, const cmds::AsyncTexImage2DCHROMIUM& c) { 10624 uint32 immediate_data_size, const cmds::AsyncTexImage2DCHROMIUM& c) {
10625 TRACE_EVENT0("gpu", "GLES2DecoderImpl::HandleAsyncTexImage2DCHROMIUM"); 10625 TRACE_EVENT0("gpu", "GLES2DecoderImpl::HandleAsyncTexImage2DCHROMIUM");
10626 GLenum target = static_cast<GLenum>(c.target); 10626 GLenum target = static_cast<GLenum>(c.target);
10627 GLint level = static_cast<GLint>(c.level); 10627 GLint level = static_cast<GLint>(c.level);
10628 // TODO(kloveless): Change HandleAsyncTexImage2DCHROMIUM command to use
10629 // unsigned integer for internalformat.
10630 GLenum internal_format = static_cast<GLenum>(c.internalformat); 10628 GLenum internal_format = static_cast<GLenum>(c.internalformat);
10631 GLsizei width = static_cast<GLsizei>(c.width); 10629 GLsizei width = static_cast<GLsizei>(c.width);
10632 GLsizei height = static_cast<GLsizei>(c.height); 10630 GLsizei height = static_cast<GLsizei>(c.height);
10633 GLint border = static_cast<GLint>(c.border); 10631 GLint border = static_cast<GLint>(c.border);
10634 GLenum format = static_cast<GLenum>(c.format); 10632 GLenum format = static_cast<GLenum>(c.format);
10635 GLenum type = static_cast<GLenum>(c.type); 10633 GLenum type = static_cast<GLenum>(c.type);
10636 uint32 pixels_shm_id = static_cast<uint32>(c.pixels_shm_id); 10634 uint32 pixels_shm_id = static_cast<uint32>(c.pixels_shm_id);
10637 uint32 pixels_shm_offset = static_cast<uint32>(c.pixels_shm_offset); 10635 uint32 pixels_shm_offset = static_cast<uint32>(c.pixels_shm_offset);
10638 uint32 pixels_size; 10636 uint32 pixels_size;
10639 uint32 async_upload_token = static_cast<uint32>(c.async_upload_token); 10637 uint32 async_upload_token = static_cast<uint32>(c.async_upload_token);
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
10876 } 10874 }
10877 } 10875 }
10878 10876
10879 // Include the auto-generated part of this file. We split this because it means 10877 // Include the auto-generated part of this file. We split this because it means
10880 // we can easily edit the non-auto generated parts right here in this file 10878 // we can easily edit the non-auto generated parts right here in this file
10881 // instead of having to edit some template or the code generator. 10879 // instead of having to edit some template or the code generator.
10882 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 10880 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
10883 10881
10884 } // namespace gles2 10882 } // namespace gles2
10885 } // namespace gpu 10883 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/cmd_buffer_functions.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698