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

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

Issue 1286193008: Reland 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: fix nvidia failure on mac and android 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
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 2569 matching lines...) Expand 10 before | Expand all | Expand 10 after
2580 draw_buffers_explicitly_enabled_(false), 2580 draw_buffers_explicitly_enabled_(false),
2581 shader_texture_lod_explicitly_enabled_(false), 2581 shader_texture_lod_explicitly_enabled_(false),
2582 compile_shader_always_succeeds_(false), 2582 compile_shader_always_succeeds_(false),
2583 lose_context_when_out_of_memory_(false), 2583 lose_context_when_out_of_memory_(false),
2584 service_logging_(base::CommandLine::InitializedForCurrentProcess() 2584 service_logging_(base::CommandLine::InitializedForCurrentProcess()
2585 ? base::CommandLine::ForCurrentProcess()->HasSwitch( 2585 ? base::CommandLine::ForCurrentProcess()->HasSwitch(
2586 switches::kEnableGPUServiceLoggingGPU) 2586 switches::kEnableGPUServiceLoggingGPU)
2587 : false), 2587 : false),
2588 viewport_max_width_(0), 2588 viewport_max_width_(0),
2589 viewport_max_height_(0), 2589 viewport_max_height_(0),
2590 texture_state_(group_->feature_info() 2590 texture_state_(group_->feature_info()->workarounds()),
2591 ->workarounds()
2592 .texsubimage_faster_than_teximage),
2593 cb_command_trace_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED( 2591 cb_command_trace_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
2594 TRACE_DISABLED_BY_DEFAULT("cb_command"))), 2592 TRACE_DISABLED_BY_DEFAULT("cb_command"))),
2595 gpu_decoder_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED( 2593 gpu_decoder_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
2596 TRACE_DISABLED_BY_DEFAULT("gpu_decoder"))), 2594 TRACE_DISABLED_BY_DEFAULT("gpu_decoder"))),
2597 gpu_trace_level_(2), 2595 gpu_trace_level_(2),
2598 gpu_trace_commands_(false), 2596 gpu_trace_commands_(false),
2599 gpu_debug_commands_(false), 2597 gpu_debug_commands_(false),
2600 validation_texture_(0), 2598 validation_texture_(0),
2601 validation_fbo_multisample_(0), 2599 validation_fbo_multisample_(0),
2602 validation_fbo_(0) { 2600 validation_fbo_(0) {
(...skipping 12180 matching lines...) Expand 10 before | Expand all | Expand 10 after
14783 return error::kNoError; 14781 return error::kNoError;
14784 } 14782 }
14785 14783
14786 // Include the auto-generated part of this file. We split this because it means 14784 // Include the auto-generated part of this file. We split this because it means
14787 // we can easily edit the non-auto generated parts right here in this file 14785 // we can easily edit the non-auto generated parts right here in this file
14788 // instead of having to edit some template or the code generator. 14786 // instead of having to edit some template or the code generator.
14789 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 14787 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
14790 14788
14791 } // namespace gles2 14789 } // namespace gles2
14792 } // namespace gpu 14790 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698