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

Side by Side Diff: gpu/command_buffer/client/gles2_implementation.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
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 // A class to emulate GLES2 over command buffers. 5 // A class to emulate GLES2 over command buffers.
6 6
7 #include "gpu/command_buffer/client/gles2_implementation.h" 7 #include "gpu/command_buffer/client/gles2_implementation.h"
8 8
9 #include <GLES2/gl2ext.h> 9 #include <GLES2/gl2ext.h>
10 #include <GLES2/gl2extchromium.h> 10 #include <GLES2/gl2extchromium.h>
(...skipping 3840 matching lines...) Expand 10 before | Expand all | Expand 10 after
3851 3851
3852 // Synchronously free rest of the unmanaged async upload buffers. 3852 // Synchronously free rest of the unmanaged async upload buffers.
3853 if (!detached_async_upload_memory_.empty()) { 3853 if (!detached_async_upload_memory_.empty()) {
3854 WaitAllAsyncTexImage2DCHROMIUM(); 3854 WaitAllAsyncTexImage2DCHROMIUM();
3855 WaitForCmd(); 3855 WaitForCmd();
3856 PollAsyncUploads(); 3856 PollAsyncUploads();
3857 } 3857 }
3858 } 3858 }
3859 3859
3860 void GLES2Implementation::AsyncTexImage2DCHROMIUM( 3860 void GLES2Implementation::AsyncTexImage2DCHROMIUM(
3861 GLenum target, GLint level, GLint internalformat, GLsizei width, 3861 GLenum target, GLint level, GLenum internalformat, GLsizei width,
3862 GLsizei height, GLint border, GLenum format, GLenum type, 3862 GLsizei height, GLint border, GLenum format, GLenum type,
3863 const void* pixels) { 3863 const void* pixels) {
3864 GPU_CLIENT_SINGLE_THREAD_CHECK(); 3864 GPU_CLIENT_SINGLE_THREAD_CHECK();
3865 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexImage2D(" 3865 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexImage2D("
3866 << GLES2Util::GetStringTextureTarget(target) << ", " 3866 << GLES2Util::GetStringTextureTarget(target) << ", "
3867 << level << ", " 3867 << level << ", "
3868 << GLES2Util::GetStringTextureInternalFormat(internalformat) << ", " 3868 << GLES2Util::GetStringTextureInternalFormat(internalformat) << ", "
3869 << width << ", " << height << ", " << border << ", " 3869 << width << ", " << height << ", " << border << ", "
3870 << GLES2Util::GetStringTextureFormat(format) << ", " 3870 << GLES2Util::GetStringTextureFormat(format) << ", "
3871 << GLES2Util::GetStringPixelType(type) << ", " 3871 << GLES2Util::GetStringPixelType(type) << ", "
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
4172 return true; 4172 return true;
4173 } 4173 }
4174 4174
4175 // Include the auto-generated part of this file. We split this because it means 4175 // Include the auto-generated part of this file. We split this because it means
4176 // we can easily edit the non-auto generated parts right here in this file 4176 // we can easily edit the non-auto generated parts right here in this file
4177 // instead of having to edit some template or the code generator. 4177 // instead of having to edit some template or the code generator.
4178 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h" 4178 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
4179 4179
4180 } // namespace gles2 4180 } // namespace gles2
4181 } // namespace gpu 4181 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/gles2_c_lib_autogen.h ('k') | gpu/command_buffer/client/gles2_implementation_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698