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

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

Issue 1426903002: gpu: Make glTexSubImage2D work with GL_SRGB_ALPHA on OpenGL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove an unneeded hunk now that workarounds are used Created 5 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "gpu/command_buffer/common/gles2_cmd_format.h" 9 #include "gpu/command_buffer/common/gles2_cmd_format.h"
10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 GL_RGBA, 212 GL_RGBA,
213 GL_UNSIGNED_BYTE, 213 GL_UNSIGNED_BYTE,
214 kSharedMemoryId, 214 kSharedMemoryId,
215 kSharedMemoryOffset, 215 kSharedMemoryOffset,
216 GL_FALSE); 216 GL_FALSE);
217 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); 217 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
218 EXPECT_EQ(GL_NO_ERROR, GetGLError()); 218 EXPECT_EQ(GL_NO_ERROR, GetGLError());
219 } 219 }
220 220
221 TEST_P(GLES2DecoderTest, TexSubImage2DBadArgs) { 221 TEST_P(GLES2DecoderTest, TexSubImage2DBadArgs) {
222 const int kWidth = 16; 222 const int kWidth = 8;
223 const int kHeight = 8; 223 const int kHeight = 4;
224 DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); 224 DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
225 DoTexImage2D(GL_TEXTURE_2D, 225 DoTexImage2D(GL_TEXTURE_2D,
226 1, 226 1,
227 GL_RGBA, 227 GL_RGBA,
228 kWidth, 228 kWidth,
229 kHeight, 229 kHeight,
230 0, 230 0,
231 GL_RGBA, 231 GL_RGBA,
232 GL_UNSIGNED_BYTE, 232 GL_UNSIGNED_BYTE,
233 0, 233 0,
(...skipping 3129 matching lines...) Expand 10 before | Expand all | Expand 10 after
3363 // TODO(gman): CompressedTexSubImage2DImmediate 3363 // TODO(gman): CompressedTexSubImage2DImmediate
3364 3364
3365 // TODO(gman): TexImage2D 3365 // TODO(gman): TexImage2D
3366 3366
3367 // TODO(gman): TexImage2DImmediate 3367 // TODO(gman): TexImage2DImmediate
3368 3368
3369 // TODO(gman): TexSubImage2DImmediate 3369 // TODO(gman): TexSubImage2DImmediate
3370 3370
3371 } // namespace gles2 3371 } // namespace gles2
3372 } // namespace gpu 3372 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698