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

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

Issue 1335873002: Initialize default texture for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gpu_unittests Created 5 years, 3 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
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 502d07634aed122a9ff92564c7a843f23442ab34..a3b7dd74f395d9ae8e2449b55223dc0473a78c56 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -8,6 +8,7 @@
#include <string>
#include <vector>
+#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "gpu/command_buffer/common/gles2_cmd_format.h"
@@ -163,7 +164,11 @@ GLES2DecoderTestBase::InitState::InitState()
}
void GLES2DecoderTestBase::InitDecoder(const InitState& init) {
- InitDecoderWithCommandLine(init, NULL);
+ base::CommandLine command_line(0, NULL);
+ gfx::GLVersionInfo gl_info(init.gl_version.c_str(), "", "");
+ if (gl_info.is_es3)
+ command_line.AppendSwitch(switches::kEnableUnsafeES3APIs);
+ InitDecoderWithCommandLine(init, &command_line);
Zhenyao Mo 2015/09/14 21:12:06 No, we definitely don't want to test all decoder t
qiankun 2015/09/15 09:14:58 Done.
}
void GLES2DecoderTestBase::InitDecoderWithCommandLine(

Powered by Google App Engine
This is Rietveld 408576698