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

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

Issue 1293123002: Revert of gpu: workaround force_cube_map_positive_x_allocation fixes Android crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/BUILD.gn ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | 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 <cmath> 10 #include <cmath>
(...skipping 2559 matching lines...) Expand 10 before | Expand all | Expand 10 after
2570 draw_buffers_explicitly_enabled_(false), 2570 draw_buffers_explicitly_enabled_(false),
2571 shader_texture_lod_explicitly_enabled_(false), 2571 shader_texture_lod_explicitly_enabled_(false),
2572 compile_shader_always_succeeds_(false), 2572 compile_shader_always_succeeds_(false),
2573 lose_context_when_out_of_memory_(false), 2573 lose_context_when_out_of_memory_(false),
2574 service_logging_(base::CommandLine::InitializedForCurrentProcess() 2574 service_logging_(base::CommandLine::InitializedForCurrentProcess()
2575 ? base::CommandLine::ForCurrentProcess()->HasSwitch( 2575 ? base::CommandLine::ForCurrentProcess()->HasSwitch(
2576 switches::kEnableGPUServiceLoggingGPU) 2576 switches::kEnableGPUServiceLoggingGPU)
2577 : false), 2577 : false),
2578 viewport_max_width_(0), 2578 viewport_max_width_(0),
2579 viewport_max_height_(0), 2579 viewport_max_height_(0),
2580 texture_state_(group_->feature_info()->workarounds()), 2580 texture_state_(group_->feature_info()
2581 ->workarounds()
2582 .texsubimage_faster_than_teximage),
2581 cb_command_trace_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED( 2583 cb_command_trace_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
2582 TRACE_DISABLED_BY_DEFAULT("cb_command"))), 2584 TRACE_DISABLED_BY_DEFAULT("cb_command"))),
2583 gpu_decoder_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED( 2585 gpu_decoder_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
2584 TRACE_DISABLED_BY_DEFAULT("gpu_decoder"))), 2586 TRACE_DISABLED_BY_DEFAULT("gpu_decoder"))),
2585 gpu_trace_level_(2), 2587 gpu_trace_level_(2),
2586 gpu_trace_commands_(false), 2588 gpu_trace_commands_(false),
2587 gpu_debug_commands_(false), 2589 gpu_debug_commands_(false),
2588 validation_texture_(0), 2590 validation_texture_(0),
2589 validation_fbo_multisample_(0), 2591 validation_fbo_multisample_(0),
2590 validation_fbo_(0) { 2592 validation_fbo_(0) {
(...skipping 11952 matching lines...) Expand 10 before | Expand all | Expand 10 after
14543 return error::kNoError; 14545 return error::kNoError;
14544 } 14546 }
14545 14547
14546 // Include the auto-generated part of this file. We split this because it means 14548 // Include the auto-generated part of this file. We split this because it means
14547 // we can easily edit the non-auto generated parts right here in this file 14549 // we can easily edit the non-auto generated parts right here in this file
14548 // instead of having to edit some template or the code generator. 14550 // instead of having to edit some template or the code generator.
14549 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 14551 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
14550 14552
14551 } // namespace gles2 14553 } // namespace gles2
14552 } // namespace gpu 14554 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/BUILD.gn ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698