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

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

Issue 871763002: Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows, try again Created 5 years, 10 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 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 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); 973 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
974 EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); 974 EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
975 } 975 }
976 976
977 TEST_P(GLES2DecoderManualInitTest, ClearUniformsBeforeFirstProgramUse) { 977 TEST_P(GLES2DecoderManualInitTest, ClearUniformsBeforeFirstProgramUse) {
978 base::CommandLine command_line(0, NULL); 978 base::CommandLine command_line(0, NULL);
979 command_line.AppendSwitchASCII( 979 command_line.AppendSwitchASCII(
980 switches::kGpuDriverBugWorkarounds, 980 switches::kGpuDriverBugWorkarounds,
981 base::IntToString(gpu::CLEAR_UNIFORMS_BEFORE_FIRST_PROGRAM_USE)); 981 base::IntToString(gpu::CLEAR_UNIFORMS_BEFORE_FIRST_PROGRAM_USE));
982 InitState init; 982 InitState init;
983 init.gl_version = "3.0";
984 init.has_alpha = true; 983 init.has_alpha = true;
985 init.request_alpha = true; 984 init.request_alpha = true;
986 init.bind_generates_resource = true; 985 init.bind_generates_resource = true;
987 InitDecoderWithCommandLine(init, &command_line); 986 InitDecoderWithCommandLine(init, &command_line);
988 { 987 {
989 static AttribInfo attribs[] = { 988 static AttribInfo attribs[] = {
990 { 989 {
991 kAttrib1Name, kAttrib1Size, kAttrib1Type, kAttrib1Location, 990 kAttrib1Name, kAttrib1Size, kAttrib1Type, kAttrib1Location,
992 }, 991 },
993 { 992 {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 } 1029 }
1031 1030
1032 // TODO(gman): DeleteProgram 1031 // TODO(gman): DeleteProgram
1033 1032
1034 // TODO(gman): UseProgram 1033 // TODO(gman): UseProgram
1035 1034
1036 // TODO(gman): DeleteShader 1035 // TODO(gman): DeleteShader
1037 1036
1038 } // namespace gles2 1037 } // namespace gles2
1039 } // namespace gpu 1038 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698